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 12/27] nfs: don't pass nfs_subversion to ->create_server()
Date:   Tue, 10 Dec 2019 07:31:00 -0500
Message-Id: <20191210123115.1655-13-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>

pick it from mount_info

Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/nfs/client.c         |  4 ++--
 fs/nfs/internal.h       |  7 ++-----
 fs/nfs/nfs3_fs.h        |  2 +-
 fs/nfs/nfs3client.c     |  5 ++---
 fs/nfs/nfs4client.c     |  3 +--
 fs/nfs/nfs4super.c      |  2 +-
 fs/nfs/super.c          | 14 +++++++-------
 include/linux/nfs_xdr.h |  2 +-
 8 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 02110a30a49e..a2049747adc4 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -951,10 +951,10 @@ EXPORT_SYMBOL_GPL(nfs_free_server);
  * Create a version 2 or 3 volume record
  * - keyed on server and FSID
  */
-struct nfs_server *nfs_create_server(struct nfs_mount_info *mount_info,
-=09=09=09=09     struct nfs_subversion *nfs_mod)
+struct nfs_server *nfs_create_server(struct nfs_mount_info *mount_info)
 {
 =09struct nfs_server *server;
+=09struct nfs_subversion *nfs_mod =3D mount_info->nfs_mod;
 =09struct nfs_fattr *fattr;
 =09int error;
=20
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 310f81a149b2..0bb0493785fc 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -170,11 +170,8 @@ extern struct nfs_client *nfs4_find_client_ident(struc=
t net *, int);
 extern struct nfs_client *
 nfs4_find_client_sessionid(struct net *, const struct sockaddr *,
 =09=09=09=09struct nfs4_sessionid *, u32);
-extern struct nfs_server *nfs_create_server(struct nfs_mount_info *,
-=09=09=09=09=09struct nfs_subversion *);
-extern struct nfs_server *nfs4_create_server(
-=09=09=09=09=09struct nfs_mount_info *,
-=09=09=09=09=09struct nfs_subversion *);
+extern struct nfs_server *nfs_create_server(struct nfs_mount_info *);
+extern struct nfs_server *nfs4_create_server(struct nfs_mount_info *);
 extern struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mou=
nt *,
 =09=09=09=09=09=09      struct nfs_fh *);
 extern int nfs4_update_server(struct nfs_server *server, const char *hostn=
ame,
diff --git a/fs/nfs/nfs3_fs.h b/fs/nfs/nfs3_fs.h
index f82e11c4cb56..09602dc1889f 100644
--- a/fs/nfs/nfs3_fs.h
+++ b/fs/nfs/nfs3_fs.h
@@ -27,7 +27,7 @@ static inline int nfs3_proc_setacls(struct inode *inode, =
struct posix_acl *acl,
 #endif /* CONFIG_NFS_V3_ACL */
=20
 /* nfs3client.c */
-struct nfs_server *nfs3_create_server(struct nfs_mount_info *, struct nfs_=
subversion *);
+struct nfs_server *nfs3_create_server(struct nfs_mount_info *);
 struct nfs_server *nfs3_clone_server(struct nfs_server *, struct nfs_fh *,
 =09=09=09=09     struct nfs_fattr *, rpc_authflavor_t);
=20
diff --git a/fs/nfs/nfs3client.c b/fs/nfs/nfs3client.c
index 223904bc40a7..54727d3d3042 100644
--- a/fs/nfs/nfs3client.c
+++ b/fs/nfs/nfs3client.c
@@ -46,10 +46,9 @@ static inline void nfs_init_server_aclclient(struct nfs_=
server *server)
 }
 #endif
=20
-struct nfs_server *nfs3_create_server(struct nfs_mount_info *mount_info,
-=09=09=09=09      struct nfs_subversion *nfs_mod)
+struct nfs_server *nfs3_create_server(struct nfs_mount_info *mount_info)
 {
-=09struct nfs_server *server =3D nfs_create_server(mount_info, nfs_mod);
+=09struct nfs_server *server =3D nfs_create_server(mount_info);
 =09/* Create a client RPC handle for the NFS v3 ACL management interface *=
/
 =09if (!IS_ERR(server))
 =09=09nfs_init_server_aclclient(server);
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 460d6251c405..538fd036b69d 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -1112,8 +1112,7 @@ static int nfs4_init_server(struct nfs_server *server=
,
  */
 /*struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data=
 *data,
 =09=09=09=09      struct nfs_fh *mntfh)*/
-struct nfs_server *nfs4_create_server(struct nfs_mount_info *mount_info,
-=09=09=09=09      struct nfs_subversion *nfs_mod)
+struct nfs_server *nfs4_create_server(struct nfs_mount_info *mount_info)
 {
 =09struct nfs_server *server;
 =09bool auth_probe;
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 1358d8078737..e5d8a76bd144 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -205,7 +205,7 @@ struct dentry *nfs4_try_mount(int flags, const char *de=
v_name,
=20
 =09dfprintk(MOUNT, "--> nfs4_try_mount()\n");
=20
-=09res =3D do_nfs4_mount(nfs4_create_server(mount_info, &nfs_v4),
+=09res =3D do_nfs4_mount(nfs4_create_server(mount_info),
 =09=09=09    flags, mount_info,
 =09=09=09    data->nfs_server.hostname,
 =09=09=09    data->nfs_server.export_path);
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 0bedac041272..6239c78d8f54 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1820,8 +1820,7 @@ static int nfs_request_mount(struct nfs_parsed_mount_=
data *args,
 =09return 0;
 }
=20
-static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mou=
nt_info,
-=09=09=09=09=09struct nfs_subversion *nfs_mod)
+static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mou=
nt_info)
 {
 =09int status;
 =09unsigned int i;
@@ -1831,6 +1830,7 @@ static struct nfs_server *nfs_try_mount_request(struc=
t nfs_mount_info *mount_inf
 =09struct nfs_parsed_mount_data *args =3D mount_info->parsed;
 =09rpc_authflavor_t authlist[NFS_MAX_SECFLAVORS];
 =09unsigned int authlist_len =3D ARRAY_SIZE(authlist);
+=09struct nfs_subversion *nfs_mod =3D mount_info->nfs_mod;
=20
 =09status =3D nfs_request_mount(args, mount_info->mntfh, authlist,
 =09=09=09=09=09&authlist_len);
@@ -1847,7 +1847,7 @@ static struct nfs_server *nfs_try_mount_request(struc=
t nfs_mount_info *mount_inf
 =09=09=09 args->selected_flavor);
 =09=09if (status)
 =09=09=09return ERR_PTR(status);
-=09=09return nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
+=09=09return nfs_mod->rpc_ops->create_server(mount_info);
 =09}
=20
 =09/*
@@ -1874,7 +1874,7 @@ static struct nfs_server *nfs_try_mount_request(struc=
t nfs_mount_info *mount_inf
 =09=09}
 =09=09dfprintk(MOUNT, "NFS: attempting to use auth flavor %u\n", flavor);
 =09=09args->selected_flavor =3D flavor;
-=09=09server =3D nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
+=09=09server =3D nfs_mod->rpc_ops->create_server(mount_info);
 =09=09if (!IS_ERR(server))
 =09=09=09return server;
 =09}
@@ -1890,7 +1890,7 @@ static struct nfs_server *nfs_try_mount_request(struc=
t nfs_mount_info *mount_inf
 =09/* Last chance! Try AUTH_UNIX */
 =09dfprintk(MOUNT, "NFS: attempting to use auth flavor %u\n", RPC_AUTH_UNI=
X);
 =09args->selected_flavor =3D RPC_AUTH_UNIX;
-=09return nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
+=09return nfs_mod->rpc_ops->create_server(mount_info);
 }
=20
 static struct dentry *nfs_fs_mount_common(int, const char *, struct nfs_mo=
unt_info *);
@@ -1900,9 +1900,9 @@ struct dentry *nfs_try_mount(int flags, const char *d=
ev_name,
 {
 =09struct nfs_subversion *nfs_mod =3D mount_info->nfs_mod;
 =09if (mount_info->parsed->need_mount)
-=09=09mount_info->server =3D nfs_try_mount_request(mount_info, nfs_mod);
+=09=09mount_info->server =3D nfs_try_mount_request(mount_info);
 =09else
-=09=09mount_info->server =3D nfs_mod->rpc_ops->create_server(mount_info, n=
fs_mod);
+=09=09mount_info->server =3D nfs_mod->rpc_ops->create_server(mount_info);
=20
 =09return nfs_fs_mount_common(flags, dev_name, mount_info);
 }
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 3ee2ad642cbc..17527f6e6360 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1722,7 +1722,7 @@ struct nfs_rpc_ops {
 =09struct nfs_client *(*init_client) (struct nfs_client *,
 =09=09=09=09const struct nfs_client_initdata *);
 =09void=09(*free_client) (struct nfs_client *);
-=09struct nfs_server *(*create_server)(struct nfs_mount_info *, struct nfs=
_subversion *);
+=09struct nfs_server *(*create_server)(struct nfs_mount_info *);
 =09struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *=
,
 =09=09=09=09=09   struct nfs_fattr *, rpc_authflavor_t);
 };
--=20
2.17.2