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

* git://oss.sgi.com:8090/xfs/xfs-2.6: (33 commits)
  [XFS] Don't use kmap in xfs_iozero.
  [XFS] Remove a bunch of unused functions from XFS.
  [XFS] Remove unused arguments from the XFS_BTREE_*_ADDR macros.
  [XFS] Remove unused header files for MAC and CAP checking functionality.
  [XFS] Make freeze code a little cleaner.
  [XFS] Remove unused argument to xfs_bmap_finish
  [XFS] Clean up use of VFS attr flags
  [XFS] Remove useless memory barrier
  [XFS] XFS sysctl cleanups
  [XFS] Fix assertion in xfs_attr_shortform_remove().
  [XFS] Fix callers of xfs_iozero() to zero the correct range.
  [XFS] Ensure a frozen filesystem has a clean log before writing the dummy
  [XFS] Fix sub-block zeroing for buffered writes into unwritten extents.
  [XFS] Re-initialize the per-cpu superblock counters after recovery.
  [XFS] Fix block reservation changes for non-SMP systems.
  [XFS] Fix block reservation mechanism.
  [XFS] Make growfs work for amounts greater than 2TB
  [XFS] Fix inode log item use-after-free on forced shutdown
  [XFS] Fix attr2 corruption with btree data extents
  [XFS] Workaround log space issue by increasing XFS_TRANS_PUSH_AIL_RESTARTS
  ...

1 files changed, 21 insertions, 25 deletions

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index c68e00105d23..f1d7ab236726 100644
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -39,13 +39,9 @@ typedef struct xfs_trans_header {
 /*
  * Log item types.
  */
-#define XFS_LI_5_3_BUF          0x1234  /* v1 bufs, 1-block inode buffers */
-#define XFS_LI_5_3_INODE        0x1235  /* 1-block inode buffers */
 #define XFS_LI_EFI              0x1236
 #define XFS_LI_EFD              0x1237
 #define XFS_LI_IUNLINK          0x1238
-#define XFS_LI_6_1_INODE        0x1239  /* 4K non-aligned inode bufs */
-#define XFS_LI_6_1_BUF          0x123a  /* v1, 4K inode buffers */
 #define XFS_LI_INODE            0x123b  /* aligned ino chunks, var-size ibufs */
 #define XFS_LI_BUF              0x123c  /* v2 bufs, variable sized inode bufs */
 #define XFS_LI_DQUOT            0x123d
@@ -354,25 +350,25 @@ typedef struct xfs_trans {
         xfs_trans_callback_t    t_callback;     /* transaction callback */
         void                    *t_callarg;     /* callback arg */
         unsigned int            t_flags;        /* misc flags */
-        long                    t_icount_delta; /* superblock icount change */
-        long                    t_ifree_delta;  /* superblock ifree change */
-        long                    t_fdblocks_delta; /* superblock fdblocks chg */
-        long                    t_res_fdblocks_delta; /* on-disk only chg */
-        long                    t_frextents_delta;/* superblock freextents chg*/
-        long                    t_res_frextents_delta; /* on-disk only chg */
+        int64_t                 t_icount_delta; /* superblock icount change */
+        int64_t                 t_ifree_delta;  /* superblock ifree change */
+        int64_t                 t_fdblocks_delta; /* superblock fdblocks chg */
+        int64_t                 t_res_fdblocks_delta; /* on-disk only chg */
+        int64_t                 t_frextents_delta;/* superblock freextents chg*/
+        int64_t                 t_res_frextents_delta; /* on-disk only chg */
 #ifdef DEBUG
-        long                    t_ag_freeblks_delta; /* debugging counter */
-        long                    t_ag_flist_delta; /* debugging counter */
-        long                    t_ag_btree_delta; /* debugging counter */
+        int64_t                 t_ag_freeblks_delta; /* debugging counter */
+        int64_t                 t_ag_flist_delta; /* debugging counter */
+        int64_t                 t_ag_btree_delta; /* debugging counter */
 #endif
-        long                    t_dblocks_delta;/* superblock dblocks change */
-        long                    t_agcount_delta;/* superblock agcount change */
-        long                    t_imaxpct_delta;/* superblock imaxpct change */
-        long                    t_rextsize_delta;/* superblock rextsize chg */
-        long                    t_rbmblocks_delta;/* superblock rbmblocks chg */
-        long                    t_rblocks_delta;/* superblock rblocks change */
-        long                    t_rextents_delta;/* superblocks rextents chg */
-        long                    t_rextslog_delta;/* superblocks rextslog chg */
+        int64_t                 t_dblocks_delta;/* superblock dblocks change */
+        int64_t                 t_agcount_delta;/* superblock agcount change */
+        int64_t                 t_imaxpct_delta;/* superblock imaxpct change */
+        int64_t                 t_rextsize_delta;/* superblock rextsize chg */
+        int64_t                 t_rbmblocks_delta;/* superblock rbmblocks chg */
+        int64_t                 t_rblocks_delta;/* superblock rblocks change */
+        int64_t                 t_rextents_delta;/* superblocks rextents chg */
+        int64_t                 t_rextslog_delta;/* superblocks rextslog chg */
         unsigned int            t_items_free;   /* log item descs free */
         xfs_log_item_chunk_t    t_items;        /* first log item desc chunk */
         xfs_trans_header_t      t_header;       /* header for in-log trans */
@@ -936,9 +932,9 @@ typedef struct xfs_trans {
 #define xfs_trans_set_sync(tp)          ((tp)->t_flags |= XFS_TRANS_SYNC)
 
 #ifdef DEBUG
-#define xfs_trans_agblocks_delta(tp, d) ((tp)->t_ag_freeblks_delta += (long)d)
-#define xfs_trans_agflist_delta(tp, d)  ((tp)->t_ag_flist_delta += (long)d)
-#define xfs_trans_agbtree_delta(tp, d)  ((tp)->t_ag_btree_delta += (long)d)
+#define xfs_trans_agblocks_delta(tp, d) ((tp)->t_ag_freeblks_delta += (int64_t)d)
+#define xfs_trans_agflist_delta(tp, d)  ((tp)->t_ag_flist_delta += (int64_t)d)
+#define xfs_trans_agbtree_delta(tp, d)  ((tp)->t_ag_btree_delta += (int64_t)d)
 #else
 #define xfs_trans_agblocks_delta(tp, d)
 #define xfs_trans_agflist_delta(tp, d)
@@ -954,7 +950,7 @@ xfs_trans_t	*_xfs_trans_alloc(struct xfs_mount *, uint);
 xfs_trans_t     *xfs_trans_dup(xfs_trans_t *);
 int             xfs_trans_reserve(xfs_trans_t *, uint, uint, uint,
                                   uint, uint);
-void            xfs_trans_mod_sb(xfs_trans_t *, uint, long);
+void            xfs_trans_mod_sb(xfs_trans_t *, uint, int64_t);
 struct xfs_buf  *xfs_trans_get_buf(xfs_trans_t *, struct xfs_buftarg *, xfs_daddr_t,
                                    int, uint);
 int             xfs_trans_read_buf(struct xfs_mount *, xfs_trans_t *,