Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Scott Mayhew <smayhew@redhat.com>
To:     anna.schumaker@netapp.com, trond.myklebust@hammerspace.com
Cc:     dhowells@redhat.com, viro@zeniv.linux.org.uk,
        linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org
Subject: [PATCH v6 07/27] nfs: lift setting mount_info from nfs_xdev_mount()
Date:   Tue, 10 Dec 2019 07:30:55 -0500
Message-Id: <20191210123115.1655-8-smayhew@redhat.com>
In-Reply-To: <20191210123115.1655-1-smayhew@redhat.com>
References: <20191210123115.1655-1-smayhew@redhat.com>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Al Viro <viro@zeniv.linux.org.uk>

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>
---
 fs/nfs/internal.h  |  3 +--
 fs/nfs/namespace.c | 35 +++++++++++++++++++++--------------
 fs/nfs/super.c     | 25 ++++---------------------
 3 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 8f4900bd04f7..b193dd626c0a 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -34,8 +34,6 @@ static inline int nfs_attr_use_mounted_on_fileid(struct n=
fs_fattr *fattr)
 struct nfs_clone_mount {
 =09const struct super_block *sb;
 =09const struct dentry *dentry;
-=09struct nfs_fh *fh;
-=09struct nfs_fattr *fattr;
 =09char *hostname;
 =09char *mnt_path;
 =09struct sockaddr *addr;
@@ -405,6 +403,7 @@ struct dentry * nfs_xdev_mount_common(struct file_syste=
m_type *, int,
 =09=09const char *, struct nfs_mount_info *);
 void nfs_kill_super(struct super_block *);
 void nfs_fill_super(struct super_block *, struct nfs_mount_info *);
+void nfs_clone_super(struct super_block *, struct nfs_mount_info *);
=20
 extern struct rpc_stat nfs_rpcstat;
=20
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"
=20
 #define NFSDBG_FACILITY=09=09NFSDBG_VFS
=20
@@ -213,16 +214,6 @@ void nfs_release_automount_timer(void)
 =09=09cancel_delayed_work(&nfs_automount_task);
 }
=20
-/*
- * Clone a mountpoint of the appropriate type
- */
-static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server,
-=09=09=09=09=09   const char *devname,
-=09=09=09=09=09   struct nfs_clone_mount *mountdata)
-{
-=09return vfs_submount(mountdata->dentry, &nfs_xdev_fs_type, devname, moun=
tdata);
-}
-
 /**
  * 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,
 =09=09=09=09 struct nfs_fattr *fattr, rpc_authflavor_t authflavor)
 {
+=09struct super_block *sb =3D dentry->d_sb;
 =09struct nfs_clone_mount mountdata =3D {
-=09=09.sb =3D dentry->d_sb,
+=09=09.sb =3D sb,
 =09=09.dentry =3D dentry,
-=09=09.fh =3D fh,
-=09=09.fattr =3D fattr,
 =09=09.authflavor =3D authflavor,
 =09};
+=09struct nfs_mount_info mount_info =3D {
+=09=09.fill_super =3D nfs_clone_super,
+=09=09.set_security =3D nfs_clone_sb_security,
+=09=09.cloned =3D &mountdata,
+=09=09.mntfh =3D fh,
+=09};
+=09struct nfs_subversion *nfs_mod =3D NFS_SB(sb)->nfs_client->cl_nfs_mod;
+=09struct nfs_server *server;
 =09struct vfsmount *mnt;
 =09char *page =3D (char *) __get_free_page(GFP_USER);
 =09char *devname;
@@ -248,12 +246,21 @@ struct vfsmount *nfs_do_submount(struct dentry *dentr=
y, struct nfs_fh *fh,
 =09if (page =3D=3D NULL)
 =09=09return ERR_PTR(-ENOMEM);
=20
+=09server =3D nfs_mod->rpc_ops->clone_server(NFS_SB(sb), fh,
+=09=09=09=09=09=09fattr, authflavor);
+=09if (IS_ERR(server))
+=09=09return ERR_CAST(server);
+
+=09mount_info.server =3D server;
+
 =09devname =3D nfs_devname(dentry, page, PAGE_SIZE);
 =09if (IS_ERR(devname))
 =09=09mnt =3D ERR_CAST(devname);
 =09else
-=09=09mnt =3D nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata=
);
+=09=09mnt =3D vfs_submount(dentry, &nfs_xdev_fs_type, devname, &mount_info=
);
=20
+=09if (mount_info.server)
+=09=09nfs_free_server(mount_info.server);
 =09free_page((unsigned long)page);
 =09return mnt;
 }
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 379c7b26051d..97dc544eb220 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2395,7 +2395,7 @@ EXPORT_SYMBOL_GPL(nfs_fill_super);
 /*
  * Finish setting up a cloned NFS2/3/4 superblock
  */
-static void nfs_clone_super(struct super_block *sb,
+void nfs_clone_super(struct super_block *sb,
 =09=09=09    struct nfs_mount_info *mount_info)
 {
 =09const struct super_block *old_sb =3D mount_info->cloned->sb;
@@ -2796,27 +2796,10 @@ static struct dentry *
 nfs_xdev_mount(struct file_system_type *fs_type, int flags,
 =09=09const char *dev_name, void *raw_data)
 {
-=09struct nfs_clone_mount *data =3D raw_data;
-=09struct nfs_mount_info mount_info =3D {
-=09=09.fill_super =3D nfs_clone_super,
-=09=09.set_security =3D nfs_clone_sb_security,
-=09=09.cloned =3D data,
-=09};
-=09struct dentry *mntroot =3D ERR_PTR(-ENOMEM);
-=09struct nfs_subversion *nfs_mod =3D NFS_SB(data->sb)->nfs_client->cl_nfs=
_mod;
-
-=09dprintk("--> nfs_xdev_mount()\n");
+=09struct nfs_mount_info *info =3D raw_data;
+=09struct nfs_subversion *nfs_mod =3D NFS_SB(info->cloned->sb)->nfs_client=
->cl_nfs_mod;
=20
-=09mount_info.mntfh =3D mount_info.cloned->fh;
-
-=09/* create a new volume representation */
-=09mount_info.server =3D nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), =
data->fh, data->fattr, data->authflavor);
-
-=09mntroot =3D nfs_fs_mount_common(flags, dev_name, &mount_info, nfs_mod);
-
-=09dprintk("<-- nfs_xdev_mount() =3D %ld\n",
-=09=09=09IS_ERR(mntroot) ? PTR_ERR(mntroot) : 0L);
-=09return mntroot;
+=09return nfs_fs_mount_common(flags, dev_name, info, nfs_mod);
 }
=20
 #if IS_ENABLED(CONFIG_NFS_V4)
--=20
2.17.2