Commit a55d3297 authored by Al Viro's avatar Al Viro Committed by Anna Schumaker
Browse files

nfs: don't bother passing nfs_subversion to ->try_mount() and nfs_fs_mount_common() 



Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 6a3f7a39

fs/nfs/internal.h

+2 −4
Original line number Diff line number Diff line
@@ -393,12 +393,10 @@ extern struct file_system_type nfs_xdev_fs_type; 
extern struct file_system_type nfs4_referral_fs_type;

#endif

bool nfs_auth_info_match(const struct nfs_auth_info *, rpc_authflavor_t);

struct dentry *nfs_try_mount(int, const char *, struct nfs_mount_info *,

			struct nfs_subversion *);

struct dentry *nfs_try_mount(int, const char *, struct nfs_mount_info *);

int nfs_set_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);

int nfs_clone_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);

struct dentry *nfs_fs_mount_common(int, const char *,

				   struct nfs_mount_info *, struct nfs_subversion *);

struct dentry *nfs_fs_mount_common(int, const char *, struct nfs_mount_info *);

struct dentry *nfs_fs_mount(struct file_system_type *, int, const char *, void *);

struct dentry * nfs_xdev_mount_common(struct file_system_type *, int,

		const char *, struct nfs_mount_info *);

fs/nfs/nfs4_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ extern const nfs4_stateid invalid_stateid; 
/* nfs4super.c */

struct nfs_mount_info;

extern struct nfs_subversion nfs_v4;

struct dentry *nfs4_try_mount(int, const char *, struct nfs_mount_info *, struct nfs_subversion *);

struct dentry *nfs4_try_mount(int, const char *, struct nfs_mount_info *);

extern bool nfs4_disable_idmapping;

extern unsigned short max_session_slots;

extern unsigned short max_session_cb_slots;

fs/nfs/nfs4super.c

+2 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct dentry * 
nfs4_remote_mount(struct file_system_type *fs_type, int flags,

		  const char *dev_name, void *info)

{

	return nfs_fs_mount_common(flags, dev_name, info, &nfs_v4);

	return nfs_fs_mount_common(flags, dev_name, info);

}



struct nfs_referral_count {
@@ -216,8 +216,7 @@ static struct dentry *do_nfs4_mount(struct nfs_server *server, int flags, 
}



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

			      struct nfs_mount_info *mount_info,

			      struct nfs_subversion *nfs_mod)

			      struct nfs_mount_info *mount_info)

{

	struct nfs_parsed_mount_data *data = mount_info->parsed;

	struct dentry *res;

fs/nfs/super.c

+8 −11
Original line number Diff line number Diff line
@@ -1893,15 +1893,15 @@ static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_inf 
}



struct dentry *nfs_try_mount(int flags, const char *dev_name,

			     struct nfs_mount_info *mount_info,

			     struct nfs_subversion *nfs_mod)

			     struct nfs_mount_info *mount_info)

{

	struct nfs_subversion *nfs_mod = mount_info->nfs_mod;

	if (mount_info->parsed->need_mount)

		mount_info->server = nfs_try_mount_request(mount_info, nfs_mod);

	else

		mount_info->server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);



	return nfs_fs_mount_common(flags, dev_name, mount_info, nfs_mod);

	return nfs_fs_mount_common(flags, dev_name, mount_info);

}

EXPORT_SYMBOL_GPL(nfs_try_mount);
@@ -2648,8 +2648,7 @@ static void nfs_set_readahead(struct backing_dev_info *bdi, 
}



struct dentry *nfs_fs_mount_common(int flags, const char *dev_name,

				   struct nfs_mount_info *mount_info,

				   struct nfs_subversion *nfs_mod)

				   struct nfs_mount_info *mount_info)

{

	struct super_block *s;

	struct dentry *mntroot = ERR_PTR(-ENOMEM);
@@ -2677,7 +2676,8 @@ struct dentry *nfs_fs_mount_common(int flags, const char *dev_name, 
			sb_mntdata.mntflags |= SB_SYNCHRONOUS;



	/* Get a superblock - note that we may end up sharing one that already exists */

	s = sget(nfs_mod->nfs_fs, compare_super, nfs_set_super, flags, &sb_mntdata);

	s = sget(mount_info->nfs_mod->nfs_fs, compare_super, nfs_set_super,

		 flags, &sb_mntdata);

	if (IS_ERR(s)) {

		mntroot = ERR_CAST(s);

		goto out_err_nosb;
@@ -2763,7 +2763,7 @@ struct dentry *nfs_fs_mount(struct file_system_type *fs_type, 
	}

	mount_info.nfs_mod = nfs_mod;



	mntroot = nfs_mod->rpc_ops->try_mount(flags, dev_name, &mount_info, nfs_mod);

	mntroot = nfs_mod->rpc_ops->try_mount(flags, dev_name, &mount_info);



	put_nfs_version(nfs_mod);

out:
@@ -2797,10 +2797,7 @@ static struct dentry * 
nfs_xdev_mount(struct file_system_type *fs_type, int flags,

		const char *dev_name, void *raw_data)

{

	struct nfs_mount_info *info = raw_data;

	struct nfs_subversion *nfs_mod = NFS_SB(info->cloned->sb)->nfs_client->cl_nfs_mod;



	return nfs_fs_mount_common(flags, dev_name, info, nfs_mod);

	return nfs_fs_mount_common(flags, dev_name, raw_data);

}



#if IS_ENABLED(CONFIG_NFS_V4)

include/linux/nfs_xdr.h

+1 −2
Original line number Diff line number Diff line
@@ -1655,8 +1655,7 @@ struct nfs_rpc_ops { 
			    struct nfs_fsinfo *);

	struct vfsmount *(*submount) (struct nfs_server *, struct dentry *,

				      struct nfs_fh *, struct nfs_fattr *);

	struct dentry *(*try_mount) (int, const char *, struct nfs_mount_info *,

				     struct nfs_subversion *);

	struct dentry *(*try_mount) (int, const char *, struct nfs_mount_info *);

	int	(*getattr) (struct nfs_server *, struct nfs_fh *,

			    struct nfs_fattr *, struct nfs4_label *,

			    struct inode *);