Merge tag 'for-linus-v3.6-rc1' of git://oss.sgi.com/xfs/xfs

Pull xfs update from Ben Myers:
 "Numerous cleanups and several bug fixes.  Here are some highlights:

   - Discontiguous directory buffer support
   - Inode allocator refactoring
   - Removal of the IO lock in inode reclaim
   - Implementation of .update_time
   - Fix for handling of EOF in xfs_vm_writepage
   - Fix for races in xfsaild, and idle mode is re-enabled
   - Fix for a crash in xfs_buf completion handlers on unmount."

Fix up trivial conflicts in fs/xfs/{xfs_buf.c,xfs_log.c,xfs_log_priv.h}
due to duplicate patches that had already been merged for 3.5.

* tag 'for-linus-v3.6-rc1' of git://oss.sgi.com/xfs/xfs: (44 commits)
  xfs: wait for the write the superblock on unmount
  xfs: re-enable xfsaild idle mode and fix associated races
  xfs: remove iolock lock classes
  xfs: avoid the iolock in xfs_free_eofblocks for evicted inodes
  xfs: do not take the iolock in xfs_inactive
  xfs: remove xfs_inactive_attrs
  xfs: clean up xfs_inactive
  xfs: do not read the AGI buffer in xfs_dialloc until nessecary
  xfs: refactor xfs_ialloc_ag_select
  xfs: add a short cut to xfs_dialloc for the non-NULL agbp case
  xfs: remove the alloc_done argument to xfs_dialloc
  xfs: split xfs_dialloc
  xfs: remove xfs_ialloc_find_free
  Prefix IO_XX flags with XFS_IO_XX to avoid namespace colision.
  xfs: remove xfs_inotobp
  xfs: merge xfs_itobp into xfs_imap_to_bp
  xfs: handle EOF correctly in xfs_vm_writepage
  xfs: implement ->update_time
  xfs: fix comment typo of struct xfs_da_blkinfo.
  xfs: do not call xfs_bdstrat_cb in xfs_buf_iodone_callbacks
  ...

1 files changed, 7 insertions, 10 deletions

diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c
index 4e5b9ad5cb97..0025c78ac03c 100644
--- a/fs/xfs/xfs_utils.c
+++ b/fs/xfs/xfs_utils.c
@@ -65,7 +65,6 @@ xfs_dir_ialloc(
         xfs_trans_t     *ntp;
         xfs_inode_t     *ip;
         xfs_buf_t       *ialloc_context = NULL;
-        boolean_t       call_again = B_FALSE;
         int             code;
         uint            log_res;
         uint            log_count;
@@ -91,7 +90,7 @@ xfs_dir_ialloc(
          * the inode(s) that we've just allocated.
          */
         code = xfs_ialloc(tp, dp, mode, nlink, rdev, prid, okalloc,
-                          &ialloc_context, &call_again, &ip);
+                          &ialloc_context, &ip);
 
         /*
          * Return an error if we were unable to allocate a new inode.
@@ -102,19 +101,18 @@ xfs_dir_ialloc(
                 *ipp = NULL;
                 return code;
         }
-        if (!call_again && (ip == NULL)) {
+        if (!ialloc_context && !ip) {
                 *ipp = NULL;
                 return XFS_ERROR(ENOSPC);
         }
 
         /*
-         * If call_again is set, then we were unable to get an
+         * If the AGI buffer is non-NULL, then we were unable to get an
          * inode in one operation.  We need to commit the current
          * transaction and call xfs_ialloc() again.  It is guaranteed
          * to succeed the second time.
          */
-        if (call_again) {
-
+        if (ialloc_context) {
                 /*
                  * Normally, xfs_trans_commit releases all the locks.
                  * We call bhold to hang on to the ialloc_context across
@@ -195,7 +193,7 @@ xfs_dir_ialloc(
                  * this call should always succeed.
                  */
                 code = xfs_ialloc(tp, dp, mode, nlink, rdev, prid,
-                                  okalloc, &ialloc_context, &call_again, &ip);
+                                  okalloc, &ialloc_context, &ip);
 
                 /*
                  * If we get an error at this point, return to the caller
@@ -206,12 +204,11 @@ xfs_dir_ialloc(
                         *ipp = NULL;
                         return code;
                 }
-                ASSERT ((!call_again) && (ip != NULL));
+                ASSERT(!ialloc_context && ip);
 
         } else {
-                if (committed != NULL) {
+                if (committed != NULL)
                         *committed = 0;
-                }
         }
 
         *ipp = ip;