[XFS] Unwrap AIL_LOCK

SGI-PV: 970382
SGI-Modid: xfs-linux-melb:xfs-kern:29739a

Signed-off-by: Donald Douwsma <donaldd@sgi.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
index f938a51be81b..132bd07b9bb8 100644
--- a/fs/xfs/xfs_extfree_item.c
+++ b/fs/xfs/xfs_extfree_item.c
@@ -110,19 +110,18 @@ STATIC void
 xfs_efi_item_unpin(xfs_efi_log_item_t *efip, int stale)
 {
         xfs_mount_t     *mp;
-        SPLDECL(s);
 
         mp = efip->efi_item.li_mountp;
-        AIL_LOCK(mp, s);
+        spin_lock(&mp->m_ail_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, s);
+                xfs_trans_delete_ail(mp, (xfs_log_item_t *)efip);
                 xfs_efi_item_free(efip);
         } else {
                 efip->efi_flags |= XFS_EFI_COMMITTED;
-                AIL_UNLOCK(mp, s);
+                spin_unlock(&mp->m_ail_lock);
         }
 }
 
@@ -138,10 +137,9 @@ xfs_efi_item_unpin_remove(xfs_efi_log_item_t *efip, xfs_trans_t *tp)
 {
         xfs_mount_t     *mp;
         xfs_log_item_desc_t     *lidp;
-        SPLDECL(s);
 
         mp = efip->efi_item.li_mountp;
-        AIL_LOCK(mp, s);
+        spin_lock(&mp->m_ail_lock);
         if (efip->efi_flags & XFS_EFI_CANCELED) {
                 /*
                  * free the xaction descriptor pointing to this item
@@ -152,11 +150,11 @@ xfs_efi_item_unpin_remove(xfs_efi_log_item_t *efip, xfs_trans_t *tp)
                  * pull the item off the AIL.
                  * xfs_trans_delete_ail() drops the AIL lock.
                  */
-                xfs_trans_delete_ail(mp, (xfs_log_item_t *)efip, s);
+                xfs_trans_delete_ail(mp, (xfs_log_item_t *)efip);
                 xfs_efi_item_free(efip);
         } else {
                 efip->efi_flags |= XFS_EFI_COMMITTED;
-                AIL_UNLOCK(mp, s);
+                spin_unlock(&mp->m_ail_lock);
         }
 }
 
@@ -350,13 +348,12 @@ xfs_efi_release(xfs_efi_log_item_t	*efip,
 {
         xfs_mount_t     *mp;
         int             extents_left;
-        SPLDECL(s);
 
         mp = efip->efi_item.li_mountp;
         ASSERT(efip->efi_next_extent > 0);
         ASSERT(efip->efi_flags & XFS_EFI_COMMITTED);
 
-        AIL_LOCK(mp, s);
+        spin_lock(&mp->m_ail_lock);
         ASSERT(efip->efi_next_extent >= nextents);
         efip->efi_next_extent -= nextents;
         extents_left = efip->efi_next_extent;
@@ -364,10 +361,10 @@ xfs_efi_release(xfs_efi_log_item_t	*efip,
                 /*
                  * xfs_trans_delete_ail() drops the AIL lock.
                  */
-                xfs_trans_delete_ail(mp, (xfs_log_item_t *)efip, s);
+                xfs_trans_delete_ail(mp, (xfs_log_item_t *)efip);
                 xfs_efi_item_free(efip);
         } else {
-                AIL_UNLOCK(mp, s);
+                spin_unlock(&mp->m_ail_lock);
         }
 }