[PATCH v6 10/12] xfs: move xfs_parseargs() validation to a helper

Ian Kent
2019-10-16T00:41:42Z

Move the validation code of xfs_parseargs() into a helper for later
use within the mount context methods.

Signed-off-by: Ian Kent <raven@themaw.net>
---
fs/xfs/xfs_super.c | 136 +++++++++++++++++++++++++++++-----------------------
1 file changed, 75 insertions(+), 61 deletions(-)

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index cd17e4e6b922..f5ea96073d11 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -305,67 +305,16 @@ xfs_parse_param(
return 0;
}

-/*
- * This function fills in xfs_mount_t fields based on mount args.
- * Note: the superblock has _not_ yet been read in.
- *
- * Note that this function leaks the various device name allocations on
- * failure. The caller takes care of them.
- *
- * *sb is const because this is also used to test options on the remount
- * path, and we don't want this to have any side effects at remount time.
- * Today this function does not change *sb, but just to future-proof...
- */
-STATIC int
-xfs_parseargs(
- struct xfs_mount *mp,
- char *options)
+static int
+xfs_validate_params(
+ struct xfs_mount *mp,
+ int dsunit,
+ int dswidth,
+ uint8_t iosizelog,
+ bool nooptions)
{
- const struct super_block *sb = mp->m_super;
- char *p;
- substring_t args[MAX_OPT_ARGS];
- int dsunit = 0;
- int dswidth = 0;
- uint8_t iosizelog = 0;
-
- /*
- * Copy binary VFS mount flags we are interested in.
- */
- if (sb_rdonly(sb))
- mp->m_flags |= XFS_MOUNT_RDONLY;
- if (sb->s_flags & SB_DIRSYNC)
- mp->m_flags |= XFS_MOUNT_DIRSYNC;
- if (sb->s_flags & SB_SYNCHRONOUS)
- mp->m_flags |= XFS_MOUNT_WSYNC;
-
- /*
- * Set some default flags that could be cleared by the mount option
- * parsing.
- */
- mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
-
- /*
- * These can be overridden by the mount option parsing.
- */
- mp->m_logbufs = -1;
- mp->m_logbsize = -1;
-
- if (!options)
- goto done;
-
- while ((p = strsep(&options, ",")) != NULL) {
- int token;
- int ret;
-
- if (!*p)
- continue;
-
- token = match_token(p, tokens, args);
- ret = xfs_parse_param(token, p, args, mp,
- &dsunit, &dswidth, &iosizelog);
- if (ret)
- return ret;
- }
+ if (nooptions)
+ goto noopts;

/*
* no recovery flag requires a read-only mount
@@ -401,7 +350,7 @@ xfs_parseargs(
return -EINVAL;
}

-done:
+noopts:
if (dsunit && !(mp->m_flags & XFS_MOUNT_NOALIGN)) {
/*
* At this point the superblock has not been read
@@ -449,6 +398,71 @@ xfs_parseargs(
return 0;
}

+/*
+ * This function fills in xfs_mount_t fields based on mount args.
+ * Note: the superblock has _not_ yet been read in.
+ *
+ * Note that this function leaks the various device name allocations on
+ * failure. The caller takes care of them.
+ *
+ * *sb is const because this is also used to test options on the remount
+ * path, and we don't want this to have any side effects at remount time.
+ * Today this function does not change *sb, but just to future-proof...
+ */
+static int
+xfs_parseargs(
+ struct xfs_mount *mp,
+ char *options)
+{
+ const struct super_block *sb = mp->m_super;
+ char *p;
+ substring_t args[MAX_OPT_ARGS];
+ int dsunit = 0;
+ int dswidth = 0;
+ uint8_t iosizelog = 0;
+
+ /*
+ * Copy binary VFS mount flags we are interested in.
+ */
+ if (sb_rdonly(sb))
+ mp->m_flags |= XFS_MOUNT_RDONLY;
+ if (sb->s_flags & SB_DIRSYNC)
+ mp->m_flags |= XFS_MOUNT_DIRSYNC;
+ if (sb->s_flags & SB_SYNCHRONOUS)
+ mp->m_flags |= XFS_MOUNT_WSYNC;
+
+ /*
+ * Set some default flags that could be cleared by the mount option
+ * parsing.
+ */
+ mp->m_flags |= XFS_MOUNT_COMPAT_IOSIZE;
+
+ /*
+ * These can be overridden by the mount option parsing.
+ */
+ mp->m_logbufs = -1;
+ mp->m_logbsize = -1;
+
+ if (!options)
+ goto done;
+
+ while ((p = strsep(&options, ",")) != NULL) {
+ int token;
+ int ret;
+
+ if (!*p)
+ continue;
+
+ token = match_token(p, tokens, args);
+ ret = xfs_parse_param(token, p, args, mp,
+ &dsunit, &dswidth, &iosizelog);
+ if (ret)
+ return ret;
+ }
+done:
+ return xfs_validate_params(mp, dsunit, dswidth, iosizelog, false);
+}
+
struct proc_xfs_info {
uint64_t flag;
char *str;