Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ba35de authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 50f59e8e

fs/xfs/linux-2.6/xfs_super.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

fs/xfs/xfs_mount.c

+15 −25
Original line number Diff line number Diff line
@@ -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);

		status = xfs_icsb_modify_counters(mp, field, delta, rsvd);

		break;

		}

		/* FALLTHROUGH */

#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 */

#endif

		default:

			status = xfs_mod_incore_sb_unlocked(mp,
@@ -1948,7 +1941,6 @@ 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,
@@ -1956,8 +1948,6 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd) 
						rsvd);

				spin_lock(&mp->m_sb_lock);

				break;

				}

				/* FALLTHROUGH */

#endif

			default:

				status = xfs_mod_incore_sb_unlocked(mp,

fs/xfs/xfs_mount.h

+0 −2
Original line number Diff line number Diff line
@@ -232,8 +232,6 @@ typedef struct xfs_mount { 
#define XFS_MOUNT_DIRSYNC	(1ULL << 21)	/* synchronous directory ops */

#define XFS_MOUNT_COMPAT_IOSIZE	(1ULL << 22)	/* don't report large preferred

						 * I/O size in stat() */

#define XFS_MOUNT_NO_PERCPU_SB	(1ULL << 23)	/* don't use per-cpu superblock

						   counters */

#define XFS_MOUNT_FILESTREAMS	(1ULL << 24)	/* enable the filestreams

						   allocator */

#define XFS_MOUNT_NOATTR2	(1ULL << 25)	/* disable use of attr2 format */