Received-SPF: pass (google.com: best guess record for domain of linux-nfs-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 06/27] nfs4: fold nfs_do_root_mount/nfs_follow_remote_path
Date:   Tue, 10 Dec 2019 07:30:54 -0500
Message-Id: <20191210123115.1655-7-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-nfs-owner@vger.kernel.org
Precedence: bulk

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

Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/nfs/nfs4super.c | 88 +++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 51 deletions(-)

diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 8146edf4ce3a..c489942b9069 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -101,37 +101,6 @@ nfs4_remote_mount(struct file_system_type *fs_type, in=
t flags,
 =09return nfs_fs_mount_common(flags, dev_name, info, &nfs_v4);
 }
=20
-static struct vfsmount *nfs_do_root_mount(struct nfs_server *server, int f=
lags,
-=09=09=09=09=09  struct nfs_mount_info *info,
-=09=09=09=09=09  const char *hostname)
-{
-=09struct vfsmount *root_mnt;
-=09char *root_devname;
-=09size_t len;
-
-=09if (IS_ERR(server))
-=09=09return ERR_CAST(server);
-
-=09len =3D strlen(hostname) + 5;
-=09root_devname =3D kmalloc(len, GFP_KERNEL);
-=09if (root_devname =3D=3D NULL) {
-=09=09nfs_free_server(server);
-=09=09return ERR_PTR(-ENOMEM);
-=09}
-=09/* Does hostname needs to be enclosed in brackets? */
-=09if (strchr(hostname, ':'))
-=09=09snprintf(root_devname, len, "[%s]:/", hostname);
-=09else
-=09=09snprintf(root_devname, len, "%s:/", hostname);
-=09info->server =3D server;
-=09root_mnt =3D vfs_kern_mount(&nfs4_remote_fs_type, flags, root_devname, =
info);
-=09if (info->server)
-=09=09nfs_free_server(info->server);
-=09info->server =3D NULL;
-=09kfree(root_devname);
-=09return root_mnt;
-}
-
 struct nfs_referral_count {
 =09struct list_head list;
 =09const struct task_struct *task;
@@ -198,11 +167,38 @@ static void nfs_referral_loop_unprotect(void)
 =09kfree(p);
 }
=20
-static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt,
-=09=09const char *export_path)
+static struct dentry *do_nfs4_mount(struct nfs_server *server, int flags,
+=09=09=09=09    struct nfs_mount_info *info,
+=09=09=09=09    const char *hostname,
+=09=09=09=09    const char *export_path)
 {
+=09struct vfsmount *root_mnt;
 =09struct dentry *dentry;
+=09char *root_devname;
 =09int err;
+=09size_t len;
+
+=09if (IS_ERR(server))
+=09=09return ERR_CAST(server);
+
+=09len =3D strlen(hostname) + 5;
+=09root_devname =3D kmalloc(len, GFP_KERNEL);
+=09if (root_devname =3D=3D NULL) {
+=09=09nfs_free_server(server);
+=09=09return ERR_PTR(-ENOMEM);
+=09}
+
+=09/* Does hostname needs to be enclosed in brackets? */
+=09if (strchr(hostname, ':'))
+=09=09snprintf(root_devname, len, "[%s]:/", hostname);
+=09else
+=09=09snprintf(root_devname, len, "%s:/", hostname);
+=09info->server =3D server;
+=09root_mnt =3D vfs_kern_mount(&nfs4_remote_fs_type, flags, root_devname, =
info);
+=09if (info->server)
+=09=09nfs_free_server(info->server);
+=09info->server =3D NULL;
+=09kfree(root_devname);
=20
 =09if (IS_ERR(root_mnt))
 =09=09return ERR_CAST(root_mnt);
@@ -223,22 +219,17 @@ struct dentry *nfs4_try_mount(int flags, const char *=
dev_name,
 =09=09=09      struct nfs_mount_info *mount_info,
 =09=09=09      struct nfs_subversion *nfs_mod)
 {
-=09char *export_path;
-=09struct vfsmount *root_mnt;
-=09struct dentry *res;
 =09struct nfs_parsed_mount_data *data =3D mount_info->parsed;
+=09struct dentry *res;
=20
 =09mount_info->set_security =3D nfs_set_sb_security;
=20
 =09dfprintk(MOUNT, "--> nfs4_try_mount()\n");
=20
-=09export_path =3D data->nfs_server.export_path;
-=09root_mnt =3D nfs_do_root_mount(
-=09=09=09nfs4_create_server(mount_info, &nfs_v4),
-=09=09=09flags, mount_info,
-=09=09=09data->nfs_server.hostname);
-
-=09res =3D nfs_follow_remote_path(root_mnt, export_path);
+=09res =3D do_nfs4_mount(nfs4_create_server(mount_info, &nfs_v4),
+=09=09=09    flags, mount_info,
+=09=09=09    data->nfs_server.hostname,
+=09=09=09    data->nfs_server.export_path);
=20
 =09dfprintk(MOUNT, "<-- nfs4_try_mount() =3D %d%s\n",
 =09=09 PTR_ERR_OR_ZERO(res),
@@ -258,8 +249,6 @@ static struct dentry *nfs4_referral_mount(struct file_s=
ystem_type *fs_type,
 =09=09.set_security =3D nfs_clone_sb_security,
 =09=09.cloned =3D data,
 =09};
-=09char *export_path;
-=09struct vfsmount *root_mnt;
 =09struct dentry *res;
=20
 =09dprintk("--> nfs4_referral_mount()\n");
@@ -268,13 +257,10 @@ static struct dentry *nfs4_referral_mount(struct file=
_system_type *fs_type,
 =09if (!mount_info.mntfh)
 =09=09return ERR_PTR(-ENOMEM);
=20
-=09export_path =3D data->mnt_path;
-=09root_mnt =3D nfs_do_root_mount(
-=09=09=09nfs4_create_referral_server(mount_info.cloned,
-=09=09=09=09=09=09    mount_info.mntfh),
-=09=09=09flags, &mount_info, data->hostname);
+=09res =3D do_nfs4_mount(nfs4_create_referral_server(mount_info.cloned,
+=09=09=09=09=09=09=09mount_info.mntfh),
+=09=09=09    flags, &mount_info, data->hostname, data->mnt_path);
=20
-=09res =3D nfs_follow_remote_path(root_mnt, export_path);
 =09dprintk("<-- nfs4_referral_mount() =3D %d%s\n",
 =09=09PTR_ERR_OR_ZERO(res),
 =09=09IS_ERR(res) ? " [error]" : "");
--=20
2.17.2