Commit 0c38f213 authored by Al Viro's avatar Al Viro Committed by Anna Schumaker
Browse files

nfs: don't pass nfs_subversion to ->create_server() 



pick it from mount_info

Reviewed-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 1bc3a2cb

fs/nfs/client.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

				     struct nfs_subversion *nfs_mod)

struct nfs_server *nfs_create_server(struct nfs_mount_info *mount_info)

{

	struct nfs_server *server;

	struct nfs_subversion *nfs_mod = mount_info->nfs_mod;

	struct nfs_fattr *fattr;

	int error;

fs/nfs/internal.h

+2 −5
Original line number Diff line number Diff line
@@ -170,11 +170,8 @@ extern struct nfs_client *nfs4_find_client_ident(struct net *, int); 
extern struct nfs_client *

nfs4_find_client_sessionid(struct net *, const struct sockaddr *,

				struct nfs4_sessionid *, u32);

extern struct nfs_server *nfs_create_server(struct nfs_mount_info *,

					struct nfs_subversion *);

extern struct nfs_server *nfs4_create_server(

					struct nfs_mount_info *,

					struct 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_mount *,

						      struct nfs_fh *);

extern int nfs4_update_server(struct nfs_server *server, const char *hostname,

fs/nfs/nfs3_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static inline int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, 
#endif /* CONFIG_NFS_V3_ACL */



/* 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 *,

				     struct nfs_fattr *, rpc_authflavor_t);

fs/nfs/nfs3client.c

+2 −3
Original line number Diff line number Diff line
@@ -46,10 +46,9 @@ static inline void nfs_init_server_aclclient(struct nfs_server *server) 
}

#endif



struct nfs_server *nfs3_create_server(struct nfs_mount_info *mount_info,

				      struct nfs_subversion *nfs_mod)

struct nfs_server *nfs3_create_server(struct nfs_mount_info *mount_info)

{

	struct nfs_server *server = nfs_create_server(mount_info, nfs_mod);

	struct nfs_server *server = nfs_create_server(mount_info);

	/* Create a client RPC handle for the NFS v3 ACL management interface */

	if (!IS_ERR(server))

		nfs_init_server_aclclient(server);

fs/nfs/nfs4client.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

				      struct nfs_fh *mntfh)*/

struct nfs_server *nfs4_create_server(struct nfs_mount_info *mount_info,

				      struct nfs_subversion *nfs_mod)

struct nfs_server *nfs4_create_server(struct nfs_mount_info *mount_info)

{

	struct nfs_server *server;

	bool auth_probe;