summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_super.c
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2019-11-05 00:58:45 +0300
committerDarrick J. Wong <darrick.wong@oracle.com>2019-11-05 19:28:26 +0300
commit9a861816a02653dcec7a97d4f639f04b0bcf09c3 (patch)
tree9ad4fc7013aec46cf092a8a5ad2c66938e8ad5a9 /fs/xfs/xfs_super.c
parent48a06e1b5773229caf13e6cc35d73cec2d2f6519 (diff)
downloadlinux-9a861816a02653dcec7a97d4f639f04b0bcf09c3.tar.xz
xfs: move xfs_parseargs() validation to a helper
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> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r--fs/xfs/xfs_super.c109
1 files changed, 58 insertions, 51 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 391c07ca6a32..4b570ba3456a 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -308,59 +308,10 @@ xfs_fc_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)
+xfs_fc_validate_params(
+ struct xfs_mount *mp)
{
- const struct super_block *sb = mp->m_super;
- char *p;
- substring_t args[MAX_OPT_ARGS];
-
- /*
- * 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;
-
- /*
- * These can be overridden by the mount option parsing.
- */
- mp->m_logbufs = -1;
- mp->m_logbsize = -1;
- mp->m_allocsize_log = 16; /* 64k */
-
- if (!options)
- return 0;
-
- while ((p = strsep(&options, ",")) != NULL) {
- int token;
- int ret;
-
- if (!*p)
- continue;
-
- token = match_token(p, tokens, args);
- ret = xfs_fc_parse_param(token, p, args, mp);
- if (ret)
- return ret;
- }
-
/*
* no recovery flag requires a read-only mount
*/
@@ -425,6 +376,62 @@ 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];
+
+ /*
+ * 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;
+
+ /*
+ * These can be overridden by the mount option parsing.
+ */
+ mp->m_logbufs = -1;
+ mp->m_logbsize = -1;
+ mp->m_allocsize_log = 16; /* 64k */
+
+ if (!options)
+ return 0;
+
+ while ((p = strsep(&options, ",")) != NULL) {
+ int token;
+ int ret;
+
+ if (!*p)
+ continue;
+
+ token = match_token(p, tokens, args);
+ ret = xfs_fc_parse_param(token, p, args, mp);
+ if (ret)
+ return ret;
+ }
+
+ return xfs_fc_validate_params(mp);
+}
+
struct proc_xfs_info {
uint64_t flag;
char *str;