summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-12-10 07:30:56 -0500
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2020-01-15 10:15:16 -0500
commit6a3f7a399ebf52164e40773f4fbcb31a4c1ec02a (patch)
tree1a257af28b878247dab1d4f536082728a811e066 /fs/nfs
parent250d69f6a465e36a6ab8602030267de2586e028f (diff)
nfs: stash nfs_subversion reference into nfs_mount_info
That will allow to get rid of passing those references around in quite a few places. Moreover, that will allow to merge xdev and remote file_system_type. Reviewed-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/internal.h1
-rw-r--r--fs/nfs/namespace.c6
-rw-r--r--fs/nfs/nfs4super.c1
-rw-r--r--fs/nfs/super.c1
4 files changed, 6 insertions, 3 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index b193dd626c0a..9888e9c7abe2 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -142,6 +142,7 @@ struct nfs_mount_info {
struct nfs_clone_mount *cloned;
struct nfs_server *server;
struct nfs_fh *mntfh;
+ struct nfs_subversion *nfs_mod;
};
extern int nfs_mount(struct nfs_mount_request *info);
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index a76aeb0c2923..a00936dd153b 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -236,8 +236,8 @@ struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh,
.set_security = nfs_clone_sb_security,
.cloned = &mountdata,
.mntfh = fh,
+ .nfs_mod = NFS_SB(sb)->nfs_client->cl_nfs_mod,
};
- struct nfs_subversion *nfs_mod = NFS_SB(sb)->nfs_client->cl_nfs_mod;
struct nfs_server *server;
struct vfsmount *mnt;
char *page = (char *) __get_free_page(GFP_USER);
@@ -246,8 +246,8 @@ struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh,
if (page == NULL)
return ERR_PTR(-ENOMEM);
- server = nfs_mod->rpc_ops->clone_server(NFS_SB(sb), fh,
- fattr, authflavor);
+ server = mount_info.nfs_mod->rpc_ops->clone_server(NFS_SB(sb), fh,
+ fattr, authflavor);
if (IS_ERR(server))
return ERR_CAST(server);
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index c489942b9069..6e5417027021 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -248,6 +248,7 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type,
.fill_super = nfs_fill_super,
.set_security = nfs_clone_sb_security,
.cloned = data,
+ .nfs_mod = &nfs_v4,
};
struct dentry *res;
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 97dc544eb220..6189f768aa59 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2761,6 +2761,7 @@ struct dentry *nfs_fs_mount(struct file_system_type *fs_type,
mntroot = ERR_CAST(nfs_mod);
goto out;
}
+ mount_info.nfs_mod = nfs_mod;
mntroot = nfs_mod->rpc_ops->try_mount(flags, dev_name, &mount_info, nfs_mod);