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

Commit 2ccf4a9b authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: collapse allocsize and biosize mount option handling 



The allocsize and biosize mount options are handled identically,
other than allocsize accepting suffixes.  suffix_kstrtoint handles
bare numbers just fine too, so these can be collapsed.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 03754234

fs/xfs/xfs_super.c

+2 −10
Original line number Diff line number Diff line
@@ -261,16 +261,8 @@ xfs_parseargs( 
			mp->m_rtname = kstrndup(value, MAXNAMELEN, GFP_KERNEL);

			if (!mp->m_rtname)

				return -ENOMEM;

		} else if (!strcmp(this_char, MNTOPT_BIOSIZE)) {

			if (!value || !*value) {

				xfs_warn(mp, "%s option requires an argument",

					this_char);

				return -EINVAL;

			}

			if (kstrtoint(value, 10, &iosize))

				return -EINVAL;

			iosizelog = ffs(iosize) - 1;

		} else if (!strcmp(this_char, MNTOPT_ALLOCSIZE)) {

		} else if (!strcmp(this_char, MNTOPT_ALLOCSIZE) ||

			   !strcmp(this_char, MNTOPT_BIOSIZE)) {

			if (!value || !*value) {

				xfs_warn(mp, "%s option requires an argument",

					this_char);