aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2010-12-19 19:57:24 -0500
committerDave Chinner <david@fromorbit.com>2010-12-19 19:57:24 -0500
commit9c5f8414efd5eeed9f498d4170337a3eb126341f (patch)
tree5801d0cbd2f37cc72e0b541231c60e281c27d874 /fs/xfs
parent821eb21d97a8b686649c08b7284d0b9f34d0e138 (diff)
xfs: fix EFI transaction cancellation.
XFS_EFI_CANCELED has not been set in the code base since xfs_efi_cancel() was removed back in 2006 by commit 065d312e15902976d256ddaf396a7950ec0350a8 ("[XFS] Remove unused iop_abort log item operation), and even then xfs_efi_cancel() was never called. I haven't tracked it back further than that (beyond git history), but it indicates that the handling of EFIs in cancelled transactions has been broken for a long time. Basically, when we get an IOP_UNPIN(lip, 1); call from xfs_trans_uncommit() (i.e. remove == 1), if we don't free the log item descriptor we leak it. Fix the behviour to be correct and kill the XFS_EFI_CANCELED flag. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_extfree_item.c20
-rw-r--r--fs/xfs/xfs_extfree_item.h1
2 files changed, 9 insertions, 12 deletions
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index a55e687bf562..5997efae05dc 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -99,10 +99,11 @@ xfs_efi_item_pin(
99} 99}
100 100
101/* 101/*
102 * While EFIs cannot really be pinned, the unpin operation is the 102 * While EFIs cannot really be pinned, the unpin operation is the last place at
103 * last place at which the EFI is manipulated during a transaction. 103 * which the EFI is manipulated during a transaction. If we are being asked to
104 * Here we coordinate with xfs_efi_cancel() to determine who gets to 104 * remove the EFI it's because the transaction has been cancelled and by
105 * free the EFI. 105 * definition that means the EFI cannot be in the AIL so remove it from the
106 * transaction and free it.
106 */ 107 */
107STATIC void 108STATIC void
108xfs_efi_item_unpin( 109xfs_efi_item_unpin(
@@ -113,17 +114,14 @@ xfs_efi_item_unpin(
113 struct xfs_ail *ailp = lip->li_ailp; 114 struct xfs_ail *ailp = lip->li_ailp;
114 115
115 spin_lock(&ailp->xa_lock); 116 spin_lock(&ailp->xa_lock);
116 if (efip->efi_flags & XFS_EFI_CANCELED) { 117 if (remove) {
117 if (remove) 118 ASSERT(!(lip->li_flags & XFS_LI_IN_AIL));
118 xfs_trans_del_item(lip); 119 xfs_trans_del_item(lip);
119
120 /* xfs_trans_ail_delete() drops the AIL lock. */
121 xfs_trans_ail_delete(ailp, lip);
122 xfs_efi_item_free(efip); 120 xfs_efi_item_free(efip);
123 } else { 121 } else {
124 efip->efi_flags |= XFS_EFI_COMMITTED; 122 efip->efi_flags |= XFS_EFI_COMMITTED;
125 spin_unlock(&ailp->xa_lock);
126 } 123 }
124 spin_unlock(&ailp->xa_lock);
127} 125}
128 126
129/* 127/*
diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
index 0d22c56fdf64..f7834ec8efad 100644
--- a/fs/xfs/xfs_extfree_item.h
+++ b/fs/xfs/xfs_extfree_item.h
@@ -115,7 +115,6 @@ typedef struct xfs_efd_log_format_64 {
115 */ 115 */
116#define XFS_EFI_RECOVERED 0x1 116#define XFS_EFI_RECOVERED 0x1
117#define XFS_EFI_COMMITTED 0x2 117#define XFS_EFI_COMMITTED 0x2
118#define XFS_EFI_CANCELED 0x4
119 118
120/* 119/*
121 * This is the "extent free intention" log item. It is used 120 * This is the "extent free intention" log item. It is used