1 files changed, 10 insertions, 25 deletions

diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index dab57374e1fe..05a4bdd4be39 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -108,17 +108,12 @@ xfs_efi_item_pin(xfs_efi_log_item_t *efip)
 STATIC void
 xfs_efi_item_unpin(xfs_efi_log_item_t *efip, int stale)
 {
-        xfs_mount_t             *mp;
-        struct xfs_ail          *ailp;
+        struct xfs_ail          *ailp = efip->efi_item.li_ailp;
 
-        mp = efip->efi_item.li_mountp;
-        ailp = efip->efi_item.li_ailp;
         spin_lock(&ailp->xa_lock);
         if (efip->efi_flags & XFS_EFI_CANCELED) {
-                /*
-                 * xfs_trans_delete_ail() drops the AIL lock.
-                 */
-                xfs_trans_delete_ail(mp, (xfs_log_item_t *)efip);
+                /* xfs_trans_ail_delete() drops the AIL lock. */
+                xfs_trans_ail_delete(ailp, (xfs_log_item_t *)efip);
                 xfs_efi_item_free(efip);
         } else {
                 efip->efi_flags |= XFS_EFI_COMMITTED;
@@ -136,12 +131,9 @@ xfs_efi_item_unpin(xfs_efi_log_item_t *efip, int stale)
 STATIC void
 xfs_efi_item_unpin_remove(xfs_efi_log_item_t *efip, xfs_trans_t *tp)
 {
-        xfs_mount_t             *mp;
-        struct xfs_ail          *ailp;
+        struct xfs_ail          *ailp = efip->efi_item.li_ailp;
         xfs_log_item_desc_t     *lidp;
 
-        mp = efip->efi_item.li_mountp;
-        ailp = efip->efi_item.li_ailp;
         spin_lock(&ailp->xa_lock);
         if (efip->efi_flags & XFS_EFI_CANCELED) {
                 /*
@@ -149,11 +141,9 @@ xfs_efi_item_unpin_remove(xfs_efi_log_item_t *efip, xfs_trans_t *tp)
                  */
                 lidp = xfs_trans_find_item(tp, (xfs_log_item_t *) efip);
                 xfs_trans_free_item(tp, lidp);
-                /*
-                 * pull the item off the AIL.
-                 * xfs_trans_delete_ail() drops the AIL lock.
-                 */
-                xfs_trans_delete_ail(mp, (xfs_log_item_t *)efip);
+
+                /* xfs_trans_ail_delete() drops the AIL lock. */
+                xfs_trans_ail_delete(ailp, (xfs_log_item_t *)efip);
                 xfs_efi_item_free(efip);
         } else {
                 efip->efi_flags |= XFS_EFI_COMMITTED;
@@ -350,12 +340,9 @@ void
 xfs_efi_release(xfs_efi_log_item_t      *efip,
                 uint                    nextents)
 {
-        xfs_mount_t             *mp;
-        struct xfs_ail          *ailp;
+        struct xfs_ail          *ailp = efip->efi_item.li_ailp;
         int                     extents_left;
 
-        mp = efip->efi_item.li_mountp;
-        ailp = efip->efi_item.li_ailp;
         ASSERT(efip->efi_next_extent > 0);
         ASSERT(efip->efi_flags & XFS_EFI_COMMITTED);
 
@@ -364,10 +351,8 @@ xfs_efi_release(xfs_efi_log_item_t	*efip,
         efip->efi_next_extent -= nextents;
         extents_left = efip->efi_next_extent;
         if (extents_left == 0) {
-                /*
-                 * xfs_trans_delete_ail() drops the AIL lock.
-                 */
-                xfs_trans_delete_ail(mp, (xfs_log_item_t *)efip);
+                /* xfs_trans_ail_delete() drops the AIL lock. */
+                xfs_trans_ail_delete(ailp, (xfs_log_item_t *)efip);
                 xfs_efi_item_free(efip);
         } else {
                 spin_unlock(&ailp->xa_lock);