diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-10-11 15:14:09 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-10-11 11:02:48 -0500 |
| commit | 17b38471c3c07a49f0bbc2ecc2e92050c164e226 (patch) | |
| tree | 163e112a5736240efc29dab83d0603c931dff98f /fs/xfs/xfs_trans_ail.c | |
| parent | bc6e588a8971aa74c02e42db4d6e0248679f3738 (diff) | |
| download | blackbird-op-linux-17b38471c3c07a49f0bbc2ecc2e92050c164e226.tar.gz blackbird-op-linux-17b38471c3c07a49f0bbc2ecc2e92050c164e226.zip | |
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( case XFS_ITEM_PUSHBUF: XFS_STATS_INC(xs_push_ail_pushbuf); - IOP_PUSHBUF(lip); - ailp->xa_last_pushed_lsn = lsn; + + if (!IOP_PUSHBUF(lip)) { + stuck++; + flush_log = 1; + } else { + ailp->xa_last_pushed_lsn = lsn; + } push_xfsbufd = 1; break; |
