Commit d72c727c authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Create a single nfs_validate_mount_data() function 



This new function chooses between the v2/3 parser and the v4 parser by
filesystem type.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b72e4f42

fs/nfs/super.c

+30 −6
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ static const struct super_operations nfs_sops = { 


#ifdef CONFIG_NFS_V4

static void nfs4_validate_mount_flags(struct nfs_parsed_mount_data *);

static int nfs4_validate_mount_data(void *options,

	struct nfs_parsed_mount_data *args, const char *dev_name);

static struct dentry *nfs4_try_mount(int flags, const char *dev_name,

	struct nfs_parsed_mount_data *data);

static struct dentry *nfs4_mount(struct file_system_type *fs_type,
@@ -1857,7 +1859,7 @@ static int nfs_parse_devname(const char *dev_name, 
 * + breaking back: trying proto=udp after proto=tcp, v2 after v3,

 *   mountproto=tcp after mountproto=udp, and so on

 */

static int nfs_validate_mount_data(void *options,

static int nfs23_validate_mount_data(void *options,

				     struct nfs_parsed_mount_data *args,

				     struct nfs_fh *mntfh,

				     const char *dev_name)
@@ -2009,6 +2011,28 @@ static int nfs_validate_mount_data(void *options, 
	return -EINVAL;

}



#ifdef CONFIG_NFS_V4

static int nfs_validate_mount_data(struct file_system_type *fs_type,

				   void *options,

				   struct nfs_parsed_mount_data *args,

				   struct nfs_fh *mntfh,

				   const char *dev_name)

{

	if (fs_type == &nfs_fs_type)

		return nfs23_validate_mount_data(options, args, mntfh, dev_name);

	return nfs4_validate_mount_data(options, args, dev_name);

}

#else

static int nfs_validate_mount_data(struct file_system_type *fs_type,

				   void *options,

				   struct nfs_parsed_mount_data *args,

				   struct nfs_fh *mntfh,

				   const char *dev_name)

{

	return nfs23_validate_mount_data(options, args, mntfh, dev_name);

}

#endif



static int nfs_validate_text_mount_data(void *options,

					struct nfs_parsed_mount_data *args,

					const char *dev_name)
@@ -2459,7 +2483,7 @@ static struct dentry *nfs_fs_mount(struct file_system_type *fs_type, 
		goto out;



	/* Validate the mount data */

	error = nfs_validate_mount_data(raw_data, data, mntfh, dev_name);

	error = nfs_validate_mount_data(fs_type, raw_data, data, mntfh, dev_name);

	if (error == NFS_TEXT_DATA)

		error = nfs_validate_text_mount_data(raw_data, data, dev_name);

	if (error < 0) {
@@ -2866,7 +2890,7 @@ static struct dentry *nfs4_mount(struct file_system_type *fs_type, 
		goto out;



	/* Validate the mount data */

	error = nfs4_validate_mount_data(raw_data, data, dev_name);

	error = nfs_validate_mount_data(fs_type, raw_data, data, NULL, dev_name);

	if (error == NFS_TEXT_DATA)

		error = nfs_validate_text_mount_data(raw_data, data, dev_name);

	if (error < 0) {