aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_inode.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2012-04-23 01:58:41 -0400
committerBen Myers <bpm@sgi.com>2012-05-14 17:20:33 -0400
commit04913fdd91f342e537005ef1233f98068b925a7f (patch)
treeb8eaacda9302290fb1833d47bf6c7be5813a80cb /fs/xfs/xfs_inode.c
parenta8569171ba26344a4c0308fc0da8f41795408ebc (diff)
xfs: pass shutdown method into xfs_trans_ail_delete_bulk
xfs_trans_ail_delete_bulk() can be called from different contexts so if the item is not in the AIL we need different shutdown for each context. Pass in the shutdown method needed so the correct action can be taken. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r--fs/xfs/xfs_inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index acd846d808b2..65d7d994d499 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2377,7 +2377,7 @@ cluster_corrupt_out:
2377 /* 2377 /*
2378 * Unlocks the flush lock 2378 * Unlocks the flush lock
2379 */ 2379 */
2380 xfs_iflush_abort(iq); 2380 xfs_iflush_abort(iq, false);
2381 kmem_free(ilist); 2381 kmem_free(ilist);
2382 xfs_perag_put(pag); 2382 xfs_perag_put(pag);
2383 return XFS_ERROR(EFSCORRUPTED); 2383 return XFS_ERROR(EFSCORRUPTED);
@@ -2482,7 +2482,7 @@ abort_out:
2482 /* 2482 /*
2483 * Unlocks the flush lock 2483 * Unlocks the flush lock
2484 */ 2484 */
2485 xfs_iflush_abort(ip); 2485 xfs_iflush_abort(ip, false);
2486 return error; 2486 return error;
2487} 2487}
2488 2488