diff options
| author | Dave Chinner <dchinner@redhat.com> | 2010-08-24 11:42:52 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2010-08-24 11:42:52 +1000 |
| commit | d17c701ce6a548a92f7f8a3cec20299465f36ee3 (patch) | |
| tree | 26a4e52b998edf3762baea43c0d9755118240c8d /fs/xfs/xfs_trans.c | |
| parent | 76be97c1fc945db08aae1f1b746012662d643e97 (diff) | |
| download | linux-d17c701ce6a548a92f7f8a3cec20299465f36ee3.tar.gz linux-d17c701ce6a548a92f7f8a3cec20299465f36ee3.tar.bz2 linux-d17c701ce6a548a92f7f8a3cec20299465f36ee3.zip | |
xfs: unlock items before allowing the CIL to commit
When we commit a transaction using delayed logging, we need to
unlock the items in the transaciton before we unlock the CIL context
and allow it to be checkpointed. If we unlock them after we release
the CIl context lock, the CIL can checkpoint and complete before
we free the log items. This breaks stale buffer item unlock and
unpin processing as there is an implicit assumption that the unlock
will occur before the unpin.
Also, some log items need to store the LSN of the transaction commit
in the item (inodes and EFIs) and so can race with other transaction
completions if we don't prevent the CIL from checkpointing before
the unlock occurs.
Cc: <stable@kernel.org>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_trans.c')
| -rw-r--r-- | fs/xfs/xfs_trans.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index fdca7416c754..1c47edaea0d2 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -1167,7 +1167,7 @@ xfs_trans_del_item( * Unlock all of the items of a transaction and free all the descriptors * of that transaction. */ -STATIC void +void xfs_trans_free_items( struct xfs_trans *tp, xfs_lsn_t commit_lsn, @@ -1653,9 +1653,6 @@ xfs_trans_commit_cil( return error; current_restore_flags_nested(&tp->t_pflags, PF_FSTRANS); - - /* xfs_trans_free_items() unlocks them first */ - xfs_trans_free_items(tp, *commit_lsn, 0); xfs_trans_free(tp); return 0; } |