diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-10-18 10:23:18 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 07:10:16 +0200 |
| commit | e7bde7c73957cfda82963127421069d13a44e921 (patch) | |
| tree | a5e9aed179986625a62af749ef63c927fb83cbb3 /fs/xfs/xfs_trans_ail.c | |
| parent | 838599d118dd286b831ba45ae380c5870ff82fe9 (diff) | |
| download | kernel_samsung_tuna-e7bde7c73957cfda82963127421069d13a44e921.zip kernel_samsung_tuna-e7bde7c73957cfda82963127421069d13a44e921.tar.gz kernel_samsung_tuna-e7bde7c73957cfda82963127421069d13a44e921.tar.bz2 | |
xfs: force the log if we encounter pinned buffers in .iop_pushbuf
commit 17b38471c3c07a49f0bbc2ecc2e92050c164e226 upstream
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 4b74b88..afc4aa0 100644 --- a/fs/xfs/xfs_trans_ail.c +++ b/fs/xfs/xfs_trans_ail.c @@ -478,8 +478,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; |