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

pick it from mount_info

Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 02110a30a49ea136d5254e84cca72e5311700d5a..a2049747adc42508fe8b5394ed43e613f8879221 100644 (file)
--- 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,
-                                    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;
 

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 310f81a149b220ca93e03695544a9981f0be9790..0bb0493785fcf403d909a6648faa5842b9f6dcce 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -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,

diff --git a/fs/nfs/nfs3_fs.h b/fs/nfs/nfs3_fs.h
index f82e11c4cb56b402b7641551c87204259750aaf9..09602dc1889f00ab31160befee1bdecc310ec7ba 100644 (file)
--- 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 */
 
 /* 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);
 

diff --git a/fs/nfs/nfs3client.c b/fs/nfs/nfs3client.c
index 223904bc40a7f965f428d97804c95bbc7684b0a2..54727d3d3042df80a5f19caa6524e461d8fa6930 100644 (file)
--- 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
 
-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);

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 460d6251c405f2182d02782f7a7cb02f22dad1b8..538fd036b69d23e61d7fd1bcce660eaf52c3ce66 100644 (file)
--- 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,
                                      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;

diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 1358d8078737d9d100599502514bb3aa6b9c2aea..e5d8a76bd144aca5093cc3a825abacb6ec6bdcf3 100644 (file)
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -205,7 +205,7 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name,
 
        dfprintk(MOUNT, "--> nfs4_try_mount()\n");
 
-       res = do_nfs4_mount(nfs4_create_server(mount_info, &nfs_v4),
+       res = do_nfs4_mount(nfs4_create_server(mount_info),
                            flags, mount_info,
                            data->nfs_server.hostname,
                            data->nfs_server.export_path);

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 0bedac041272c81715f645914183d12b5097e152..6239c78d8f5481dc8511634f623f96fdfdd79cfe 100644 (file)
--- 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,
        return 0;
 }
 
-static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_info,
-                                       struct nfs_subversion *nfs_mod)
+static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_info)
 {
        int status;
        unsigned int i;
@@ -1831,6 +1830,7 @@ static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_inf
        struct nfs_parsed_mount_data *args = mount_info->parsed;
        rpc_authflavor_t authlist[NFS_MAX_SECFLAVORS];
        unsigned int authlist_len = ARRAY_SIZE(authlist);
+       struct nfs_subversion *nfs_mod = mount_info->nfs_mod;
 
        status = nfs_request_mount(args, mount_info->mntfh, authlist,
                                        &authlist_len);
@@ -1847,7 +1847,7 @@ static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_inf
                         args->selected_flavor);
                if (status)
                        return ERR_PTR(status);
-               return nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
+               return nfs_mod->rpc_ops->create_server(mount_info);
        }
 
        /*
@@ -1874,7 +1874,7 @@ static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_inf
                }
                dfprintk(MOUNT, "NFS: attempting to use auth flavor %u\n", flavor);
                args->selected_flavor = flavor;
-               server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
+               server = nfs_mod->rpc_ops->create_server(mount_info);
                if (!IS_ERR(server))
                        return server;
        }
@@ -1890,7 +1890,7 @@ static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_inf
        /* Last chance! Try AUTH_UNIX */
        dfprintk(MOUNT, "NFS: attempting to use auth flavor %u\n", RPC_AUTH_UNIX);
        args->selected_flavor = RPC_AUTH_UNIX;
-       return nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
+       return nfs_mod->rpc_ops->create_server(mount_info);
 }
 
 static struct dentry *nfs_fs_mount_common(int, const char *, struct nfs_mount_info *);
@@ -1900,9 +1900,9 @@ struct dentry *nfs_try_mount(int flags, const char *dev_name,
 {
        struct nfs_subversion *nfs_mod = mount_info->nfs_mod;
        if (mount_info->parsed->need_mount)
-               mount_info->server = nfs_try_mount_request(mount_info, nfs_mod);
+               mount_info->server = nfs_try_mount_request(mount_info);
        else
-               mount_info->server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
+               mount_info->server = nfs_mod->rpc_ops->create_server(mount_info);
 
        return nfs_fs_mount_common(flags, dev_name, mount_info);
 }

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 3ee2ad642cbc44b6d39a17884c88244858f1ff47..17527f6e636058e592d97242109042a8f176fed5 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1722,7 +1722,7 @@ struct nfs_rpc_ops {
        struct nfs_client *(*init_client) (struct nfs_client *,
                                const struct nfs_client_initdata *);
        void    (*free_client) (struct nfs_client *);
-       struct nfs_server *(*create_server)(struct nfs_mount_info *, struct nfs_subversion *);
+       struct nfs_server *(*create_server)(struct nfs_mount_info *);
        struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *,
                                           struct nfs_fattr *, rpc_authflavor_t);
 };