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

* git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Add lockdep support for XFS
  [XFS] Fix race in xfs_write() b/w dmapi callout and direct I/O checks.
  [XFS] Get rid of redundant "required" in msg.
  [XFS] Export via a function xfs_buftarg_list for use by kdb/xfsidbg.
  [XFS] Remove unused ilen variable and references.
  [XFS] Fix to prevent the notorious 'NULL files' problem after a crash.
  [XFS] Fix race condition in xfs_write().
  [XFS] Fix uquota and oquota enforcement problems.
  [XFS] propogate return codes from flush routines
  [XFS] Fix quotaon syscall failures for group enforcement requests.
  [XFS] Invalidate quotacheck when mounting without a quota type.
  [XFS] reducing the number of random number functions.
  [XFS] remove more misc. unused args
  [XFS] the "aendp" arg to xfs_dir2_data_freescan is always NULL, remove it.
  [XFS] The last argument "lsn" of xfs_trans_commit() is always called with

1 files changed, 4 insertions, 8 deletions

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 9d358ffce4e5..7ce44a7b88a2 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -328,8 +328,7 @@ xfs_attr_set_int(xfs_inode_t *dp, const char *name, int namelen,
                                 xfs_trans_set_sync(args.trans);
                         }
                         err2 = xfs_trans_commit(args.trans,
-                                                 XFS_TRANS_RELEASE_LOG_RES,
-                                                 NULL);
+                                                 XFS_TRANS_RELEASE_LOG_RES);
                         xfs_iunlock(dp, XFS_ILOCK_EXCL);
 
                         /*
@@ -397,8 +396,7 @@ xfs_attr_set_int(xfs_inode_t *dp, const char *name, int namelen,
          * Commit the last in the sequence of transactions.
          */
         xfs_trans_log_inode(args.trans, dp, XFS_ILOG_CORE);
-        error = xfs_trans_commit(args.trans, XFS_TRANS_RELEASE_LOG_RES,
-                                 NULL);
+        error = xfs_trans_commit(args.trans, XFS_TRANS_RELEASE_LOG_RES);
         xfs_iunlock(dp, XFS_ILOCK_EXCL);
 
         /*
@@ -544,8 +542,7 @@ xfs_attr_remove_int(xfs_inode_t *dp, const char *name, int namelen, int flags)
          * Commit the last in the sequence of transactions.
          */
         xfs_trans_log_inode(args.trans, dp, XFS_ILOG_CORE);
-        error = xfs_trans_commit(args.trans, XFS_TRANS_RELEASE_LOG_RES,
-                                 NULL);
+        error = xfs_trans_commit(args.trans, XFS_TRANS_RELEASE_LOG_RES);
         xfs_iunlock(dp, XFS_ILOCK_EXCL);
 
         /*
@@ -859,8 +856,7 @@ xfs_attr_inactive(xfs_inode_t *dp)
          * Commit the last in the sequence of transactions.
          */
         xfs_trans_log_inode(trans, dp, XFS_ILOG_CORE);
-        error = xfs_trans_commit(trans, XFS_TRANS_RELEASE_LOG_RES,
-                                 NULL);
+        error = xfs_trans_commit(trans, XFS_TRANS_RELEASE_LOG_RES);
         xfs_iunlock(dp, XFS_ILOCK_EXCL);
 
         return(error);