summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_mount.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-09-30 06:25:54 +0400
committerAlex Elder <aelder@sgi.com>2010-10-19 00:07:58 +0400
commit61ba35dea0593fbc8d062cab3e4c4c3da5ce7104 (patch)
treefa28b2c9d0c5a71f1d0415b042d45a7a56b8c2ff /fs/xfs/xfs_mount.c
parent50f59e8eed85ec4c79bc2454ed50c7886f6c5ebf (diff)
downloadlinux-61ba35dea0593fbc8d062cab3e4c4c3da5ce7104.tar.xz
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>
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r--fs/xfs/xfs_mount.c40
1 files changed, 15 insertions, 25 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index cfa2fb4e7f97..55de83585e00 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1856,12 +1856,8 @@ xfs_mod_incore_sb(
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 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd)
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 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd)
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,