diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-10-11 11:14:09 -0400 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2011-10-11 12:02:48 -0400 |
commit | 17b38471c3c07a49f0bbc2ecc2e92050c164e226 (patch) | |
tree | 163e112a5736240efc29dab83d0603c931dff98f /fs/xfs/xfs_trans_ail.c | |
parent | bc6e588a8971aa74c02e42db4d6e0248679f3738 (diff) |
xfs: force the log if we encounter pinned buffers in .iop_pushbuf
We need to check for pinned buffers even in .iop_pushbuf given that inode
items flush into the same buffers that may be pinned directly due operations
on the unlinked inode list operating directly on buffers. To do this add a
return value to .iop_pushbuf that tells the AIL push about this and use
the existing log force mechanisms to unpin it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Stefan Priebe <s.priebe@profihost.ag>
Tested-by: Stefan Priebe <s.priebe@profihost.ag>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_trans_ail.c')
-rw-r--r-- | fs/xfs/xfs_trans_ail.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c index 9bd1ee55ef6a..e4cd9180d33a 100644 --- a/fs/xfs/xfs_trans_ail.c +++ b/fs/xfs/xfs_trans_ail.c | |||
@@ -427,8 +427,13 @@ xfs_ail_worker( | |||
427 | 427 | ||
428 | case XFS_ITEM_PUSHBUF: | 428 | case XFS_ITEM_PUSHBUF: |
429 | XFS_STATS_INC(xs_push_ail_pushbuf); | 429 | XFS_STATS_INC(xs_push_ail_pushbuf); |
430 | IOP_PUSHBUF(lip); | 430 | |
431 | ailp->xa_last_pushed_lsn = lsn; | 431 | if (!IOP_PUSHBUF(lip)) { |
432 | stuck++; | ||
433 | flush_log = 1; | ||
434 | } else { | ||
435 | ailp->xa_last_pushed_lsn = lsn; | ||
436 | } | ||
432 | push_xfsbufd = 1; | 437 | push_xfsbufd = 1; |
433 | break; | 438 | break; |
434 | 439 | ||