diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-09-30 02:25:54 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-10-18 15:07:58 -0500 |
| commit | 61ba35dea0593fbc8d062cab3e4c4c3da5ce7104 (patch) | |
| tree | fa28b2c9d0c5a71f1d0415b042d45a7a56b8c2ff /fs/xfs/linux-2.6/xfs_super.c | |
| parent | 50f59e8eed85ec4c79bc2454ed50c7886f6c5ebf (diff) | |
| download | lwn-61ba35dea0593fbc8d062cab3e4c4c3da5ce7104.tar.gz lwn-61ba35dea0593fbc8d062cab3e4c4c3da5ce7104.zip | |
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/linux-2.6/xfs_super.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 4759be4daa26..a316c7316702 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c @@ -1518,8 +1518,9 @@ xfs_fs_fill_super( if (error) goto out_free_fsname; - if (xfs_icsb_init_counters(mp)) - mp->m_flags |= XFS_MOUNT_NO_PERCPU_SB; + error = xfs_icsb_init_counters(mp); + if (error) + goto out_close_devices; error = xfs_readsb(mp, flags); if (error) @@ -1580,6 +1581,7 @@ xfs_fs_fill_super( xfs_freesb(mp); out_destroy_counters: xfs_icsb_destroy_counters(mp); + out_close_devices: xfs_close_devices(mp); out_free_fsname: xfs_free_fsname(mp); |