Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

* git://oss.sgi.com:8090/oss/git/xfs-2.6: (71 commits)
  [XFS] Sync up one/two other minor changes missed in previous merges.
  [XFS] Reenable the noikeep (delete inode cluster space) option by default.
  [XFS] Check that a page has dirty buffers before finding it acceptable for
  [XFS] Fixup naming inconsistencies found by Pekka Enberg and one from Jan
  [XFS] Explain the race closed by the addition of vn_iowait() to the start
  [XFS] Fixing the error caused by the conflict between DIO Write's
  [XFS] Fixing KDB's xrwtrc command, also added the current process id into
  [XFS] Fix compiler warning from xfs_file_compat_invis_ioctl prototype.
  [XFS] remove bogus INT_GET for u8 variables in xfs_dir_leaf.c
  [XFS] endianess annotations for xfs_da_node_hdr_t
  [XFS] endianess annotations for xfs_da_node_entry_t
  [XFS] store xfs_attr_inactive_list_t in native endian
  [XFS] store xfs_attr_sf_sort in native endian
  [XFS] endianess annotations for xfs_attr_shortform_t
  [XFS] endianess annotations for xfs_attr_leaf_name_remote_t
  [XFS] endianess annotations for xfs_attr_leaf_name_local_t
  [XFS] endianess annotations for xfs_attr_leaf_entry_t
  [XFS] endianess annotations for xfs_attr_leaf_hdr_t
  [XFS] remove bogus INT_GET on u8 variables in xfs_dir2_block.c
  [XFS] endianess annotations for xfs_da_blkinfo_t
  ...

diff --combined fs/xfs/linux-2.6/xfs_buf.c
index 8cdfa41516599f1f7889691e67107bb208fe1d66,cdb905ab4dba888635beca92338920a9f93c19b5..9fb0312665caacd41872527e101f8c19706ceaa1
--- 1/fs/xfs/linux-2.6/xfs_buf.c
--- 2/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@@ -29,7 -29,6 +29,7 @@@
  #include <linux/blkdev.h>
  #include <linux/hash.h>
  #include <linux/kthread.h>
 +#include <linux/migrate.h>
  #include "xfs_linux.h"
  
  STATIC kmem_zone_t *xfs_buf_zone;
@@@ -1806,13 -1805,12 +1806,12 @@@ xfs_flush_buftarg
  int __init
  xfs_buf_init(void)
  {
-       int             error = -ENOMEM;
- 
  #ifdef XFS_BUF_TRACE
        xfs_buf_trace_buf = ktrace_alloc(XFS_BUF_TRACE_SIZE, KM_SLEEP);
  #endif
  
-       xfs_buf_zone = kmem_zone_init(sizeof(xfs_buf_t), "xfs_buf");
+       xfs_buf_zone = kmem_zone_init_flags(sizeof(xfs_buf_t), "xfs_buf",
+                                               KM_ZONE_HWALIGN, NULL);
        if (!xfs_buf_zone)
                goto out_free_trace_buf;
  
@@@ -1840,7 -1838,7 +1839,7 @@@
  #ifdef XFS_BUF_TRACE
        ktrace_free(xfs_buf_trace_buf);
  #endif
-       return error;
+       return -ENOMEM;
  }
  
  void