[PATCH] xfs: collapse allocsize and biosize mount option handling

[PATCH] xfs: collapse allocsize and biosize mount option handling

[Eric Sandeen]

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.

(In other news, though, maybe biosize needs to be deprecated?
XFS_IOC_SETBIOSIZE and XFS_IOC_GETBIOSIZE are deprecated, and
"biosize" was removed from Documentation/ back in 2005 ...)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 1fb1656..4bd6c0d 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -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);

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: collapse allocsize and biosize mount option handling

[Brian Foster]

On Fri, Aug 21, 2015 at 04:15:48PM -0500, Eric Sandeen wrote:
> 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.
> 
> (In other news, though, maybe biosize needs to be deprecated?
> XFS_IOC_SETBIOSIZE and XFS_IOC_GETBIOSIZE are deprecated, and
> "biosize" was removed from Documentation/ back in 2005 ...)
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

> 
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 1fb1656..4bd6c0d 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -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);
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs