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 04/27] nfs: fold nfs4_remote_fs_type and nfs4_remote_referral_fs_type
Date:   Tue, 10 Dec 2019 07:30:52 -0500
Message-Id: <20191210123115.1655-5-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>

They are identical now.

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

diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index ac3e8928643d..54dbb4561ccc 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -22,8 +22,6 @@ static struct dentry *nfs4_remote_mount(struct file_syste=
m_type *fs_type,
 =09int flags, const char *dev_name, void *raw_data);
 static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type=
,
 =09int flags, const char *dev_name, void *raw_data);
-static struct dentry *nfs4_remote_referral_mount(struct file_system_type *=
fs_type,
-=09int flags, const char *dev_name, void *raw_data);
=20
 static struct file_system_type nfs4_remote_fs_type =3D {
 =09.owner=09=09=3D THIS_MODULE,
@@ -33,14 +31,6 @@ static struct file_system_type nfs4_remote_fs_type =3D {
 =09.fs_flags=09=3D FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA,
 };
=20
-static struct file_system_type nfs4_remote_referral_fs_type =3D {
-=09.owner=09=09=3D THIS_MODULE,
-=09.name=09=09=3D "nfs4",
-=09.mount=09=09=3D nfs4_remote_referral_mount,
-=09.kill_sb=09=3D nfs_kill_super,
-=09.fs_flags=09=3D FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA,
-};
-
 struct file_system_type nfs4_referral_fs_type =3D {
 =09.owner=09=09=3D THIS_MODULE,
 =09.name=09=09=3D "nfs4",
@@ -111,8 +101,7 @@ nfs4_remote_mount(struct file_system_type *fs_type, int=
 flags,
 =09return nfs_fs_mount_common(flags, dev_name, info, &nfs_v4);
 }
=20
-static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type=
,
-=09=09=09=09=09  struct nfs_server *server, int flags,
+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)
 {
@@ -135,7 +124,7 @@ static struct vfsmount *nfs_do_root_mount(struct file_s=
ystem_type *fs_type,
 =09else
 =09=09snprintf(root_devname, len, "%s:/", hostname);
 =09info->server =3D server;
-=09root_mnt =3D vfs_kern_mount(fs_type, flags, root_devname, info);
+=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;
@@ -245,7 +234,7 @@ struct dentry *nfs4_try_mount(int flags, const char *de=
v_name,
=20
 =09export_path =3D data->nfs_server.export_path;
 =09data->nfs_server.export_path =3D "/";
-=09root_mnt =3D nfs_do_root_mount(&nfs4_remote_fs_type,
+=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);
@@ -259,13 +248,6 @@ struct dentry *nfs4_try_mount(int flags, const char *d=
ev_name,
 =09return res;
 }
=20
-static struct dentry *
-nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags,
-=09=09=09   const char *dev_name, void *raw_data)
-{
-=09return nfs_fs_mount_common(flags, dev_name, raw_data, &nfs_v4);
-}
-
 /*
  * Create an NFS4 server record on referral traversal
  */
@@ -290,7 +272,7 @@ static struct dentry *nfs4_referral_mount(struct file_s=
ystem_type *fs_type,
=20
 =09export_path =3D data->mnt_path;
 =09data->mnt_path =3D "/";
-=09root_mnt =3D nfs_do_root_mount(&nfs4_remote_referral_fs_type,
+=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);
--=20
2.17.2