diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2019-12-10 07:30:55 -0500 |
---|---|---|
committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2020-01-15 10:15:16 -0500 |
commit | 250d69f6a465e36a6ab8602030267de2586e028f (patch) | |
tree | 8edaae969ee3936dee2cc262ded26112dd08b320 /fs/nfs/namespace.c | |
parent | 4e357761bd44bbba3c3af226c2cc216beff0935c (diff) | |
download | linux-250d69f6a465e36a6ab8602030267de2586e028f.tar.bz2 |
nfs: lift setting mount_info from nfs_xdev_mount()
Do it in nfs_do_submount() instead. As a side benefit, nfs_clone_data
doesn't need ->fh and ->fattr anymore.
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/namespace.c')
-rw-r--r-- | fs/nfs/namespace.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index 5e0e9d29f5c5..a76aeb0c2923 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c @@ -19,6 +19,7 @@ #include <linux/vfs.h> #include <linux/sunrpc/gss_api.h> #include "internal.h" +#include "nfs.h" #define NFSDBG_FACILITY NFSDBG_VFS @@ -213,16 +214,6 @@ void nfs_release_automount_timer(void) cancel_delayed_work(&nfs_automount_task); } -/* - * Clone a mountpoint of the appropriate type - */ -static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server, - const char *devname, - struct nfs_clone_mount *mountdata) -{ - return vfs_submount(mountdata->dentry, &nfs_xdev_fs_type, devname, mountdata); -} - /** * nfs_do_submount - set up mountpoint when crossing a filesystem boundary * @dentry: parent directory @@ -234,13 +225,20 @@ static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server, struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh, struct nfs_fattr *fattr, rpc_authflavor_t authflavor) { + struct super_block *sb = dentry->d_sb; struct nfs_clone_mount mountdata = { - .sb = dentry->d_sb, + .sb = sb, .dentry = dentry, - .fh = fh, - .fattr = fattr, .authflavor = authflavor, }; + struct nfs_mount_info mount_info = { + .fill_super = nfs_clone_super, + .set_security = nfs_clone_sb_security, + .cloned = &mountdata, + .mntfh = fh, + }; + 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); char *devname; @@ -248,12 +246,21 @@ 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); + if (IS_ERR(server)) + return ERR_CAST(server); + + mount_info.server = server; + devname = nfs_devname(dentry, page, PAGE_SIZE); if (IS_ERR(devname)) mnt = ERR_CAST(devname); else - mnt = nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata); + mnt = vfs_submount(dentry, &nfs_xdev_fs_type, devname, &mount_info); + if (mount_info.server) + nfs_free_server(mount_info.server); free_page((unsigned long)page); return mnt; } |