[XFS] Finish removing the mount pointer from the AIL API

Change all the remaining AIL API functions that are passed struct
xfs_mount pointers to pass pointers directly to the struct xfs_ail being
used. With this conversion, all external access to the AIL is via the
struct xfs_ail. Hence the operation and referencing of the AIL is almost
entirely independent of the xfs_mount that is using it - it is now much
more tightly tied to the log and the items it is tracking in the log than
it is tied to the xfs_mount.

SGI-PV: 988143

SGI-Modid: xfs-linux-melb:xfs-kern:32353a

Signed-off-by: David Chinner <david@fromorbit.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>

1 files changed, 12 insertions, 17 deletions

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 47594f4b51db..aa9bf05060c6 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -977,9 +977,8 @@ xfs_iflush_done(
         xfs_buf_t               *bp,
         xfs_inode_log_item_t    *iip)
 {
-        xfs_inode_t     *ip;
-
-        ip = iip->ili_inode;
+        xfs_inode_t             *ip = iip->ili_inode;
+        struct xfs_ail          *ailp = iip->ili_item.li_ailp;
 
         /*
          * We only want to pull the item from the AIL if it is
@@ -992,15 +991,12 @@ xfs_iflush_done(
          */
         if (iip->ili_logged &&
             (iip->ili_item.li_lsn == iip->ili_flush_lsn)) {
-                spin_lock(&ip->i_mount->m_ail->xa_lock);
+                spin_lock(&ailp->xa_lock);
                 if (iip->ili_item.li_lsn == iip->ili_flush_lsn) {
-                        /*
-                         * xfs_trans_delete_ail() drops the AIL lock.
-                         */
-                        xfs_trans_delete_ail(ip->i_mount,
-                                             (xfs_log_item_t*)iip);
+                        /* xfs_trans_ail_delete() drops the AIL lock. */
+                        xfs_trans_ail_delete(ailp, (xfs_log_item_t*)iip);
                 } else {
-                        spin_unlock(&ip->i_mount->m_ail->xa_lock);
+                        spin_unlock(&ailp->xa_lock);
                 }
         }
 
@@ -1032,21 +1028,20 @@ void
 xfs_iflush_abort(
         xfs_inode_t             *ip)
 {
-        xfs_inode_log_item_t    *iip;
+        xfs_inode_log_item_t    *iip = ip->i_itemp;
         xfs_mount_t             *mp;
 
         iip = ip->i_itemp;
         mp = ip->i_mount;
         if (iip) {
+                struct xfs_ail  *ailp = iip->ili_item.li_ailp;
                 if (iip->ili_item.li_flags & XFS_LI_IN_AIL) {
-                        spin_lock(&mp->m_ail->xa_lock);
+                        spin_lock(&ailp->xa_lock);
                         if (iip->ili_item.li_flags & XFS_LI_IN_AIL) {
-                                /*
-                                 * xfs_trans_delete_ail() drops the AIL lock.
-                                 */
-                                xfs_trans_delete_ail(mp, (xfs_log_item_t *)iip);
+                                /* xfs_trans_ail_delete() drops the AIL lock. */
+                                xfs_trans_ail_delete(ailp, (xfs_log_item_t *)iip);
                         } else
-                                spin_unlock(&mp->m_ail->xa_lock);
+                                spin_unlock(&ailp->xa_lock);
                 }
                 iip->ili_logged = 0;
                 /*