X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=fs%2Fxfs%2Fxfs_trans_item.c;h=767af4810775dfb0367866ed295e5c786cd9c4ea;hb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;hp=56062796a81d936c648cae873ef580c84d6cd51b;hpb=c449269f45c2cdf53af08c8d0af37472f66539d9;p=linux-2.6.git diff --git a/fs/xfs/xfs_trans_item.c b/fs/xfs/xfs_trans_item.c index 56062796a..767af4810 100644 --- a/fs/xfs/xfs_trans_item.c +++ b/fs/xfs/xfs_trans_item.c @@ -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