vserver 1.9.3

[linux-2.6.git] / fs / xfs / xfs_trans_item.c

diff --git a/fs/xfs/xfs_trans_item.c b/fs/xfs/xfs_trans_item.c
index 5606279..1b8a756 100644 (file)
--- a/fs/xfs/xfs_trans_item.c
+++ b/fs/xfs/xfs_trans_item.c
@@ -290,7 +290,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
        }
        ASSERT(0);
        /* NOTREACHED */
-       return 0; /* keep gcc quite */
+       return NULL; /* keep gcc quite */
 }
 
 /*
@@ -397,7 +397,8 @@ xfs_trans_unlock_items(xfs_trans_t *tp, xfs_lsn_t commit_lsn)
  * Stamp the commit lsn into each item if necessary.
  * Free descriptors pointing to items which are not dirty if freeing_chunk
  * is zero. If freeing_chunk is non-zero, then we need to unlock all
- * items in the chunk including those with XFS_LID_SYNC_UNLOCK set.
+ * items in the chunk.
+ * 
  * Return the number of descriptors freed.
  */
 STATIC int
@@ -423,18 +424,9 @@ xfs_trans_unlock_chunk(
 
                if (commit_lsn != NULLCOMMITLSN)
                        IOP_COMMITTING(lip, commit_lsn);
-
-               /* XXXsup */
                if (abort)
                        lip->li_flags |= XFS_LI_ABORTED;
-
-               /* if (abort) {
-                       IOP_ABORT(lip);
-               } else */
-               if (!(lidp->lid_flags & XFS_LID_SYNC_UNLOCK) ||
-                          freeing_chunk || abort) {
-                       IOP_UNLOCK(lip);
-               }
+               IOP_UNLOCK(lip);
 
                /*
                 * Free the descriptor if the item is not dirty