xfs: remove XFS_MOUNT_NO_PERCPU_SB
Fail the mount if we can't allocate memory for the per-CPU counters.
This is consistent with how we handle everything else in the mount
path and makes the superblock counter modification a lot simpler.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index cfa2fb4..55de835 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1856,12 +1856,8 @@
case XFS_SBS_ICOUNT:
case XFS_SBS_IFREE:
case XFS_SBS_FDBLOCKS:
- if (!(mp->m_flags & XFS_MOUNT_NO_PERCPU_SB)) {
- status = xfs_icsb_modify_counters(mp, field,
- delta, rsvd);
- break;
- }
- /* FALLTHROUGH */
+ status = xfs_icsb_modify_counters(mp, field, delta, rsvd);
+ break;
#endif
default:
spin_lock(&mp->m_sb_lock);
@@ -1910,15 +1906,12 @@
case XFS_SBS_ICOUNT:
case XFS_SBS_IFREE:
case XFS_SBS_FDBLOCKS:
- if (!(mp->m_flags & XFS_MOUNT_NO_PERCPU_SB)) {
- spin_unlock(&mp->m_sb_lock);
- status = xfs_icsb_modify_counters(mp,
- msbp->msb_field,
- msbp->msb_delta, rsvd);
- spin_lock(&mp->m_sb_lock);
- break;
- }
- /* FALLTHROUGH */
+ spin_unlock(&mp->m_sb_lock);
+ status = xfs_icsb_modify_counters(mp,
+ msbp->msb_field,
+ msbp->msb_delta, rsvd);
+ spin_lock(&mp->m_sb_lock);
+ break;
#endif
default:
status = xfs_mod_incore_sb_unlocked(mp,
@@ -1948,16 +1941,13 @@
case XFS_SBS_ICOUNT:
case XFS_SBS_IFREE:
case XFS_SBS_FDBLOCKS:
- if (!(mp->m_flags & XFS_MOUNT_NO_PERCPU_SB)) {
- spin_unlock(&mp->m_sb_lock);
- status = xfs_icsb_modify_counters(mp,
- msbp->msb_field,
- -(msbp->msb_delta),
- rsvd);
- spin_lock(&mp->m_sb_lock);
- break;
- }
- /* FALLTHROUGH */
+ spin_unlock(&mp->m_sb_lock);
+ status = xfs_icsb_modify_counters(mp,
+ msbp->msb_field,
+ -(msbp->msb_delta),
+ rsvd);
+ spin_lock(&mp->m_sb_lock);
+ break;
#endif
default:
status = xfs_mod_incore_sb_unlocked(mp,