1 files changed, 194 insertions, 150 deletions

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index ebdb76da527c..6409b3762995 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -136,15 +136,9 @@ xfs_mount_init(void)
                 mp->m_flags |= XFS_MOUNT_NO_PERCPU_SB;
         }
 
-        AIL_LOCKINIT(&mp->m_ail_lock, "xfs_ail");
-        spinlock_init(&mp->m_sb_lock, "xfs_sb");
+        spin_lock_init(&mp->m_sb_lock);
         mutex_init(&mp->m_ilock);
         mutex_init(&mp->m_growlock);
-        /*
-         * Initialize the AIL.
-         */
-        xfs_trans_ail_init(mp);
-
         atomic_set(&mp->m_active_trans, 0);
 
         return mp;
@@ -171,7 +165,7 @@ xfs_mount_free(
                           sizeof(xfs_perag_t) * mp->m_sb.sb_agcount);
         }
 
-        AIL_LOCK_DESTROY(&mp->m_ail_lock);
+        spinlock_destroy(&mp->m_ail_lock);
         spinlock_destroy(&mp->m_sb_lock);
         mutex_destroy(&mp->m_ilock);
         mutex_destroy(&mp->m_growlock);
@@ -616,7 +610,7 @@ xfs_mount_common(xfs_mount_t *mp, xfs_sb_t *sbp)
         int     i;
 
         mp->m_agfrotor = mp->m_agirotor = 0;
-        spinlock_init(&mp->m_agirotor_lock, "m_agirotor_lock");
+        spin_lock_init(&mp->m_agirotor_lock);
         mp->m_maxagi = mp->m_sb.sb_agcount;
         mp->m_blkbit_log = sbp->sb_blocklog + XFS_NBBYLOG;
         mp->m_blkbb_log = sbp->sb_blocklog - BBSHIFT;
@@ -696,7 +690,6 @@ xfs_initialize_perag_data(xfs_mount_t *mp, xfs_agnumber_t agcount)
         uint64_t        bfreelst = 0;
         uint64_t        btree = 0;
         int             error;
-        int             s;
 
         for (index = 0; index < agcount; index++) {
                 /*
@@ -721,11 +714,11 @@ xfs_initialize_perag_data(xfs_mount_t *mp, xfs_agnumber_t agcount)
         /*
          * Overwrite incore superblock counters with just-read data
          */
-        s = XFS_SB_LOCK(mp);
+        spin_lock(&mp->m_sb_lock);
         sbp->sb_ifree = ifree;
         sbp->sb_icount = ialloc;
         sbp->sb_fdblocks = bfree + bfreelst + btree;
-        XFS_SB_UNLOCK(mp, s);
+        spin_unlock(&mp->m_sb_lock);
 
         /* Fixup the per-cpu counters as well. */
         xfs_icsb_reinit_counters(mp);
@@ -734,49 +727,13 @@ xfs_initialize_perag_data(xfs_mount_t *mp, xfs_agnumber_t agcount)
 }
 
 /*
- * xfs_mountfs
- *
- * This function does the following on an initial mount of a file system:
- *      - reads the superblock from disk and init the mount struct
- *      - if we're a 32-bit kernel, do a size check on the superblock
- *              so we don't mount terabyte filesystems
- *      - init mount struct realtime fields
- *      - allocate inode hash table for fs
- *      - init directory manager
- *      - perform recovery and init the log manager
+ * Update alignment values based on mount options and sb values
  */
-int
-xfs_mountfs(
-        xfs_mount_t     *mp,
-        int             mfsi_flags)
+STATIC int
+xfs_update_alignment(xfs_mount_t *mp, int mfsi_flags, __uint64_t *update_flags)
 {
-        xfs_buf_t       *bp;
         xfs_sb_t        *sbp = &(mp->m_sb);
-        xfs_inode_t     *rip;
-        bhv_vnode_t     *rvp = NULL;
-        int             readio_log, writeio_log;
-        xfs_daddr_t     d;
-        __uint64_t      resblks;
-        __int64_t       update_flags;
-        uint            quotamount, quotaflags;
-        int             agno;
-        int             uuid_mounted = 0;
-        int             error = 0;
 
-        if (mp->m_sb_bp == NULL) {
-                if ((error = xfs_readsb(mp, mfsi_flags))) {
-                        return error;
-                }
-        }
-        xfs_mount_common(mp, sbp);
-
-        /*
-         * Check if sb_agblocks is aligned at stripe boundary
-         * If sb_agblocks is NOT aligned turn off m_dalign since
-         * allocator alignment is within an ag, therefore ag has
-         * to be aligned at stripe boundary.
-         */
-        update_flags = 0LL;
         if (mp->m_dalign && !(mfsi_flags & XFS_MFSI_SECOND)) {
                 /*
                  * If stripe unit and stripe width are not multiples
@@ -787,8 +744,7 @@ xfs_mountfs(
                         if (mp->m_flags & XFS_MOUNT_RETERR) {
                                 cmn_err(CE_WARN,
                                         "XFS: alignment check 1 failed");
-                                error = XFS_ERROR(EINVAL);
-                                goto error1;
+                                return XFS_ERROR(EINVAL);
                         }
                         mp->m_dalign = mp->m_swidth = 0;
                 } else {
@@ -798,8 +754,7 @@ xfs_mountfs(
                         mp->m_dalign = XFS_BB_TO_FSBT(mp, mp->m_dalign);
                         if (mp->m_dalign && (sbp->sb_agblocks % mp->m_dalign)) {
                                 if (mp->m_flags & XFS_MOUNT_RETERR) {
-                                        error = XFS_ERROR(EINVAL);
-                                        goto error1;
+                                        return XFS_ERROR(EINVAL);
                                 }
                                 xfs_fs_cmn_err(CE_WARN, mp,
 "stripe alignment turned off: sunit(%d)/swidth(%d) incompatible with agsize(%d)",
@@ -816,8 +771,7 @@ xfs_mountfs(
 "stripe alignment turned off: sunit(%d) less than bsize(%d)",
                                                 mp->m_dalign,
                                                 mp->m_blockmask +1);
-                                        error = XFS_ERROR(EINVAL);
-                                        goto error1;
+                                        return XFS_ERROR(EINVAL);
                                 }
                                 mp->m_swidth = 0;
                         }
@@ -830,11 +784,11 @@ xfs_mountfs(
                 if (XFS_SB_VERSION_HASDALIGN(sbp)) {
                         if (sbp->sb_unit != mp->m_dalign) {
                                 sbp->sb_unit = mp->m_dalign;
-                                update_flags |= XFS_SB_UNIT;
+                                *update_flags |= XFS_SB_UNIT;
                         }
                         if (sbp->sb_width != mp->m_swidth) {
                                 sbp->sb_width = mp->m_swidth;
-                                update_flags |= XFS_SB_WIDTH;
+                                *update_flags |= XFS_SB_WIDTH;
                         }
                 }
         } else if ((mp->m_flags & XFS_MOUNT_NOALIGN) != XFS_MOUNT_NOALIGN &&
@@ -843,49 +797,45 @@ xfs_mountfs(
                         mp->m_swidth = sbp->sb_width;
         }
 
-        xfs_alloc_compute_maxlevels(mp);
-        xfs_bmap_compute_maxlevels(mp, XFS_DATA_FORK);
-        xfs_bmap_compute_maxlevels(mp, XFS_ATTR_FORK);
-        xfs_ialloc_compute_maxlevels(mp);
+        return 0;
+}
 
-        if (sbp->sb_imax_pct) {
-                __uint64_t      icount;
+/*
+ * Set the maximum inode count for this filesystem
+ */
+STATIC void
+xfs_set_maxicount(xfs_mount_t *mp)
+{
+        xfs_sb_t        *sbp = &(mp->m_sb);
+        __uint64_t      icount;
 
-                /* Make sure the maximum inode count is a multiple of the
-                 * units we allocate inodes in.
+        if (sbp->sb_imax_pct) {
+                /*
+                 * Make sure the maximum inode count is a multiple
+                 * of the units we allocate inodes in.
                  */
-
                 icount = sbp->sb_dblocks * sbp->sb_imax_pct;
                 do_div(icount, 100);
                 do_div(icount, mp->m_ialloc_blks);
                 mp->m_maxicount = (icount * mp->m_ialloc_blks)  <<
                                    sbp->sb_inopblog;
-        } else
+        } else {
                 mp->m_maxicount = 0;
-
-        mp->m_maxioffset = xfs_max_file_offset(sbp->sb_blocklog);
-
-        /*
-         * XFS uses the uuid from the superblock as the unique
-         * identifier for fsid.  We can not use the uuid from the volume
-         * since a single partition filesystem is identical to a single
-         * partition volume/filesystem.
-         */
-        if ((mfsi_flags & XFS_MFSI_SECOND) == 0 &&
-            (mp->m_flags & XFS_MOUNT_NOUUID) == 0) {
-                if (xfs_uuid_mount(mp)) {
-                        error = XFS_ERROR(EINVAL);
-                        goto error1;
-                }
-                uuid_mounted=1;
         }
+}
+
+/*
+ * Set the default minimum read and write sizes unless
+ * already specified in a mount option.
+ * We use smaller I/O sizes when the file system
+ * is being used for NFS service (wsync mount option).
+ */
+STATIC void
+xfs_set_rw_sizes(xfs_mount_t *mp)
+{
+        xfs_sb_t        *sbp = &(mp->m_sb);
+        int             readio_log, writeio_log;
 
-        /*
-         * Set the default minimum read and write sizes unless
-         * already specified in a mount option.
-         * We use smaller I/O sizes when the file system
-         * is being used for NFS service (wsync mount option).
-         */
         if (!(mp->m_flags & XFS_MOUNT_DFLT_IOSIZE)) {
                 if (mp->m_flags & XFS_MOUNT_WSYNC) {
                         readio_log = XFS_WSYNC_READIO_LOG;
@@ -911,17 +861,14 @@ xfs_mountfs(
                 mp->m_writeio_log = writeio_log;
         }
         mp->m_writeio_blocks = 1 << (mp->m_writeio_log - sbp->sb_blocklog);
+}
 
-        /*
-         * Set the inode cluster size.
-         * This may still be overridden by the file system
-         * block size if it is larger than the chosen cluster size.
-         */
-        mp->m_inode_cluster_size = XFS_INODE_BIG_CLUSTER_SIZE;
-
-        /*
-         * Set whether we're using inode alignment.
-         */
+/*
+ * Set whether we're using inode alignment.
+ */
+STATIC void
+xfs_set_inoalignment(xfs_mount_t *mp)
+{
         if (XFS_SB_VERSION_HASALIGN(&mp->m_sb) &&
             mp->m_sb.sb_inoalignmt >=
             XFS_B_TO_FSBT(mp, mp->m_inode_cluster_size))
@@ -937,14 +884,22 @@ xfs_mountfs(
                 mp->m_sinoalign = mp->m_dalign;
         else
                 mp->m_sinoalign = 0;
-        /*
-         * Check that the data (and log if separate) are an ok size.
-         */
+}
+
+/*
+ * Check that the data (and log if separate) are an ok size.
+ */
+STATIC int
+xfs_check_sizes(xfs_mount_t *mp, int mfsi_flags)
+{
+        xfs_buf_t       *bp;
+        xfs_daddr_t     d;
+        int             error;
+
         d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks);
         if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_dblocks) {
                 cmn_err(CE_WARN, "XFS: size check 1 failed");
-                error = XFS_ERROR(E2BIG);
-                goto error1;
+                return XFS_ERROR(E2BIG);
         }
         error = xfs_read_buf(mp, mp->m_ddev_targp,
                              d - XFS_FSS_TO_BB(mp, 1),
@@ -953,10 +908,9 @@ xfs_mountfs(
                 xfs_buf_relse(bp);
         } else {
                 cmn_err(CE_WARN, "XFS: size check 2 failed");
-                if (error == ENOSPC) {
+                if (error == ENOSPC)
                         error = XFS_ERROR(E2BIG);
-                }
-                goto error1;
+                return error;
         }
 
         if (((mfsi_flags & XFS_MFSI_CLIENT) == 0) &&
@@ -964,8 +918,7 @@ xfs_mountfs(
                 d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
                 if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_logblocks) {
                         cmn_err(CE_WARN, "XFS: size check 3 failed");
-                        error = XFS_ERROR(E2BIG);
-                        goto error1;
+                        return XFS_ERROR(E2BIG);
                 }
                 error = xfs_read_buf(mp, mp->m_logdev_targp,
                                      d - XFS_FSB_TO_BB(mp, 1),
@@ -974,17 +927,111 @@ xfs_mountfs(
                         xfs_buf_relse(bp);
                 } else {
                         cmn_err(CE_WARN, "XFS: size check 3 failed");
-                        if (error == ENOSPC) {
+                        if (error == ENOSPC)
                                 error = XFS_ERROR(E2BIG);
-                        }
+                        return error;
+                }
+        }
+        return 0;
+}
+
+/*
+ * xfs_mountfs
+ *
+ * This function does the following on an initial mount of a file system:
+ *      - reads the superblock from disk and init the mount struct
+ *      - if we're a 32-bit kernel, do a size check on the superblock
+ *              so we don't mount terabyte filesystems
+ *      - init mount struct realtime fields
+ *      - allocate inode hash table for fs
+ *      - init directory manager
+ *      - perform recovery and init the log manager
+ */
+int
+xfs_mountfs(
+        xfs_mount_t     *mp,
+        int             mfsi_flags)
+{
+        xfs_sb_t        *sbp = &(mp->m_sb);
+        xfs_inode_t     *rip;
+        bhv_vnode_t     *rvp = NULL;
+        __uint64_t      resblks;
+        __int64_t       update_flags = 0LL;
+        uint            quotamount, quotaflags;
+        int             agno;
+        int             uuid_mounted = 0;
+        int             error = 0;
+
+        if (mp->m_sb_bp == NULL) {
+                error = xfs_readsb(mp, mfsi_flags);
+                if (error)
+                        return error;
+        }
+        xfs_mount_common(mp, sbp);
+
+        /*
+         * Check if sb_agblocks is aligned at stripe boundary
+         * If sb_agblocks is NOT aligned turn off m_dalign since
+         * allocator alignment is within an ag, therefore ag has
+         * to be aligned at stripe boundary.
+         */
+        error = xfs_update_alignment(mp, mfsi_flags, &update_flags);
+        if (error)
+                goto error1;
+
+        xfs_alloc_compute_maxlevels(mp);
+        xfs_bmap_compute_maxlevels(mp, XFS_DATA_FORK);
+        xfs_bmap_compute_maxlevels(mp, XFS_ATTR_FORK);
+        xfs_ialloc_compute_maxlevels(mp);
+
+        xfs_set_maxicount(mp);
+
+        mp->m_maxioffset = xfs_max_file_offset(sbp->sb_blocklog);
+
+        /*
+         * XFS uses the uuid from the superblock as the unique
+         * identifier for fsid.  We can not use the uuid from the volume
+         * since a single partition filesystem is identical to a single
+         * partition volume/filesystem.
+         */
+        if ((mfsi_flags & XFS_MFSI_SECOND) == 0 &&
+            (mp->m_flags & XFS_MOUNT_NOUUID) == 0) {
+                if (xfs_uuid_mount(mp)) {
+                        error = XFS_ERROR(EINVAL);
                         goto error1;
                 }
+                uuid_mounted=1;
         }
 
         /*
+         * Set the minimum read and write sizes
+         */
+        xfs_set_rw_sizes(mp);
+
+        /*
+         * Set the inode cluster size.
+         * This may still be overridden by the file system
+         * block size if it is larger than the chosen cluster size.
+         */
+        mp->m_inode_cluster_size = XFS_INODE_BIG_CLUSTER_SIZE;
+
+        /*
+         * Set inode alignment fields
+         */
+        xfs_set_inoalignment(mp);
+
+        /*
+         * Check that the data (and log if separate) are an ok size.
+         */
+        error = xfs_check_sizes(mp, mfsi_flags);
+        if (error)
+                goto error1;
+
+        /*
          * Initialize realtime fields in the mount structure
          */
-        if ((error = xfs_rtmount_init(mp))) {
+        error = xfs_rtmount_init(mp);
+        if (error) {
                 cmn_err(CE_WARN, "XFS: RT mount failed");
                 goto error1;
         }
@@ -1102,7 +1149,8 @@ xfs_mountfs(
         /*
          * Initialize realtime inode pointers in the mount structure
          */
-        if ((error = xfs_rtmount_inodes(mp))) {
+        error = xfs_rtmount_inodes(mp);
+        if (error) {
                 /*
                  * Free up the root inode.
                  */
@@ -1120,7 +1168,8 @@ xfs_mountfs(
         /*
          * Initialise the XFS quota management subsystem for this mount
          */
-        if ((error = XFS_QM_INIT(mp, &quotamount, &quotaflags)))
+        error = XFS_QM_INIT(mp, &quotamount, &quotaflags);
+        if (error)
                 goto error4;
 
         /*
@@ -1137,7 +1186,8 @@ xfs_mountfs(
         /*
          * Complete the quota initialisation, post-log-replay component.
          */
-        if ((error = XFS_QM_MOUNT(mp, quotamount, quotaflags, mfsi_flags)))
+        error = XFS_QM_MOUNT(mp, quotamount, quotaflags, mfsi_flags);
+        if (error)
                 goto error4;
 
         /*
@@ -1255,7 +1305,6 @@ xfs_unmountfs(xfs_mount_t *mp, struct cred *cr)
 #if defined(DEBUG) || defined(INDUCE_IO_ERROR)
         xfs_errortag_clearall(mp, 0);
 #endif
-        XFS_IODONE(mp);
         xfs_mount_free(mp);
         return 0;
 }
@@ -1441,7 +1490,7 @@ xfs_mod_sb(xfs_trans_t *tp, __int64_t fields)
  * Fields are not allowed to dip below zero, so if the delta would
  * do this do not apply it and return EINVAL.
  *
- * The SB_LOCK must be held when this routine is called.
+ * The m_sb_lock must be held when this routine is called.
  */
 int
 xfs_mod_incore_sb_unlocked(
@@ -1606,7 +1655,7 @@ xfs_mod_incore_sb_unlocked(
 /*
  * xfs_mod_incore_sb() is used to change a field in the in-core
  * superblock structure by the specified delta.  This modification
- * is protected by the SB_LOCK.  Just use the xfs_mod_incore_sb_unlocked()
+ * is protected by the m_sb_lock.  Just use the xfs_mod_incore_sb_unlocked()
  * routine to do the work.
  */
 int
@@ -1616,7 +1665,6 @@ xfs_mod_incore_sb(
         int64_t         delta,
         int             rsvd)
 {
-        unsigned long   s;
         int     status;
 
         /* check for per-cpu counters */
@@ -1633,9 +1681,9 @@ xfs_mod_incore_sb(
                 /* FALLTHROUGH */
 #endif
         default:
-                s = XFS_SB_LOCK(mp);
+                spin_lock(&mp->m_sb_lock);
                 status = xfs_mod_incore_sb_unlocked(mp, field, delta, rsvd);
-                XFS_SB_UNLOCK(mp, s);
+                spin_unlock(&mp->m_sb_lock);
                 break;
         }
 
@@ -1656,7 +1704,6 @@ xfs_mod_incore_sb(
 int
 xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd)
 {
-        unsigned long   s;
         int             status=0;
         xfs_mod_sb_t    *msbp;
 
@@ -1664,10 +1711,10 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd)
          * Loop through the array of mod structures and apply each
          * individually.  If any fail, then back out all those
          * which have already been applied.  Do all of this within
-         * the scope of the SB_LOCK so that all of the changes will
+         * the scope of the m_sb_lock so that all of the changes will
          * be atomic.
          */
-        s = XFS_SB_LOCK(mp);
+        spin_lock(&mp->m_sb_lock);
         msbp = &msb[0];
         for (msbp = &msbp[0]; msbp < (msb + nmsb); msbp++) {
                 /*
@@ -1681,11 +1728,11 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd)
                 case XFS_SBS_IFREE:
                 case XFS_SBS_FDBLOCKS:
                         if (!(mp->m_flags & XFS_MOUNT_NO_PERCPU_SB)) {
-                                XFS_SB_UNLOCK(mp, s);
+                                spin_unlock(&mp->m_sb_lock);
                                 status = xfs_icsb_modify_counters(mp,
                                                         msbp->msb_field,
                                                         msbp->msb_delta, rsvd);
-                                s = XFS_SB_LOCK(mp);
+                                spin_lock(&mp->m_sb_lock);
                                 break;
                         }
                         /* FALLTHROUGH */
@@ -1719,12 +1766,12 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd)
                         case XFS_SBS_IFREE:
                         case XFS_SBS_FDBLOCKS:
                                 if (!(mp->m_flags & XFS_MOUNT_NO_PERCPU_SB)) {
-                                        XFS_SB_UNLOCK(mp, s);
+                                        spin_unlock(&mp->m_sb_lock);
                                         status = xfs_icsb_modify_counters(mp,
                                                         msbp->msb_field,
                                                         -(msbp->msb_delta),
                                                         rsvd);
-                                        s = XFS_SB_LOCK(mp);
+                                        spin_lock(&mp->m_sb_lock);
                                         break;
                                 }
                                 /* FALLTHROUGH */
@@ -1740,7 +1787,7 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd)
                         msbp--;
                 }
         }
-        XFS_SB_UNLOCK(mp, s);
+        spin_unlock(&mp->m_sb_lock);
         return status;
 }
 
@@ -1888,12 +1935,12 @@ xfs_mount_log_sbunit(
  *
  * Locking rules:
  *
- *      1. XFS_SB_LOCK() before picking up per-cpu locks
+ *      1. m_sb_lock before picking up per-cpu locks
  *      2. per-cpu locks always picked up via for_each_online_cpu() order
- *      3. accurate counter sync requires XFS_SB_LOCK + per cpu locks
+ *      3. accurate counter sync requires m_sb_lock + per cpu locks
  *      4. modifying per-cpu counters requires holding per-cpu lock
- *      5. modifying global counters requires holding XFS_SB_LOCK
- *      6. enabling or disabling a counter requires holding the XFS_SB_LOCK
+ *      5. modifying global counters requires holding m_sb_lock
+ *      6. enabling or disabling a counter requires holding the m_sb_lock 
  *         and _none_ of the per-cpu locks.
  *
  * Disabled counters are only ever re-enabled by a balance operation
@@ -1920,7 +1967,6 @@ xfs_icsb_cpu_notify(
 {
         xfs_icsb_cnts_t *cntp;
         xfs_mount_t     *mp;
-        int             s;
 
         mp = (xfs_mount_t *)container_of(nfb, xfs_mount_t, m_icsb_notifier);
         cntp = (xfs_icsb_cnts_t *)
@@ -1946,7 +1992,7 @@ xfs_icsb_cpu_notify(
                  * count into the total on the global superblock and
                  * re-enable the counters. */
                 xfs_icsb_lock(mp);
-                s = XFS_SB_LOCK(mp);
+                spin_lock(&mp->m_sb_lock);
                 xfs_icsb_disable_counter(mp, XFS_SBS_ICOUNT);
                 xfs_icsb_disable_counter(mp, XFS_SBS_IFREE);
                 xfs_icsb_disable_counter(mp, XFS_SBS_FDBLOCKS);
@@ -1963,7 +2009,7 @@ xfs_icsb_cpu_notify(
                                          XFS_ICSB_SB_LOCKED, 0);
                 xfs_icsb_balance_counter(mp, XFS_SBS_FDBLOCKS,
                                          XFS_ICSB_SB_LOCKED, 0);
-                XFS_SB_UNLOCK(mp, s);
+                spin_unlock(&mp->m_sb_lock);
                 xfs_icsb_unlock(mp);
                 break;
         }
@@ -2194,11 +2240,10 @@ xfs_icsb_sync_counters_flags(
         int             flags)
 {
         xfs_icsb_cnts_t cnt;
-        int             s;
 
         /* Pass 1: lock all counters */
         if ((flags & XFS_ICSB_SB_LOCKED) == 0)
-                s = XFS_SB_LOCK(mp);
+                spin_lock(&mp->m_sb_lock);
 
         xfs_icsb_count(mp, &cnt, flags);
 
@@ -2211,7 +2256,7 @@ xfs_icsb_sync_counters_flags(
                 mp->m_sb.sb_fdblocks = cnt.icsb_fdblocks;
 
         if ((flags & XFS_ICSB_SB_LOCKED) == 0)
-                XFS_SB_UNLOCK(mp, s);
+                spin_unlock(&mp->m_sb_lock);
 }
 
 /*
@@ -2252,11 +2297,10 @@ xfs_icsb_balance_counter(
 {
         uint64_t        count, resid;
         int             weight = num_online_cpus();
-        int             s;
         uint64_t        min = (uint64_t)min_per_cpu;
 
         if (!(flags & XFS_ICSB_SB_LOCKED))
-                s = XFS_SB_LOCK(mp);
+                spin_lock(&mp->m_sb_lock);
 
         /* disable counter and sync counter */
         xfs_icsb_disable_counter(mp, field);
@@ -2290,10 +2334,10 @@ xfs_icsb_balance_counter(
         xfs_icsb_enable_counter(mp, field, count, resid);
 out:
         if (!(flags & XFS_ICSB_SB_LOCKED))
-                XFS_SB_UNLOCK(mp, s);
+                spin_unlock(&mp->m_sb_lock);
 }
 
-int
+STATIC int
 xfs_icsb_modify_counters(
         xfs_mount_t     *mp,
         xfs_sb_field_t  field,
@@ -2302,7 +2346,7 @@ xfs_icsb_modify_counters(
 {
         xfs_icsb_cnts_t *icsbp;
         long long       lcounter;       /* long counter for 64 bit fields */
-        int             cpu, ret = 0, s;
+        int             cpu, ret = 0;
 
         might_sleep();
 again:
@@ -2380,15 +2424,15 @@ slow_path:
          * running atomically here, we know a rebalance cannot
          * be in progress. Hence we can go straight to operating
          * on the global superblock. We do not call xfs_mod_incore_sb()
-         * here even though we need to get the SB_LOCK. Doing so
+         * here even though we need to get the m_sb_lock. Doing so
          * will cause us to re-enter this function and deadlock.
-         * Hence we get the SB_LOCK ourselves and then call
+         * Hence we get the m_sb_lock ourselves and then call
          * xfs_mod_incore_sb_unlocked() as the unlocked path operates
          * directly on the global counters.
          */
-        s = XFS_SB_LOCK(mp);
+        spin_lock(&mp->m_sb_lock);
         ret = xfs_mod_incore_sb_unlocked(mp, field, delta, rsvd);
-        XFS_SB_UNLOCK(mp, s);
+        spin_unlock(&mp->m_sb_lock);
 
         /*
          * Now that we've modified the global superblock, we