NFS: Rename get_nfs_version() -> find_nfs_version()

We have a put_nfs_version() that handles refcounting on the nfs version
module, but get_nfs_version() does much more work to find a version
module based on version number. Let's change 'get' to 'find' to better
match what it's doing.

Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 5b547d0afa18740c5a3843d16f599701c41dc6eb..27f862490f82d1d1e5dab91b1031630daa8e2b8d 100644 (file)
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -80,7 +80,7 @@ const struct rpc_program nfs_program = {
        .pipe_dir_name          = NFS_PIPE_DIRNAME,
 };
 
-static struct nfs_subversion *find_nfs_version(unsigned int version)
+static struct nfs_subversion *__find_nfs_version(unsigned int version)
 {
        struct nfs_subversion *nfs;
 
@@ -93,13 +93,13 @@ static struct nfs_subversion *find_nfs_version(unsigned int version)
        return nfs;
 }
 
-struct nfs_subversion *get_nfs_version(unsigned int version)
+struct nfs_subversion *find_nfs_version(unsigned int version)
 {
-       struct nfs_subversion *nfs = find_nfs_version(version);
+       struct nfs_subversion *nfs = __find_nfs_version(version);
 
        if (IS_ERR(nfs)) {
                request_module("nfsv%d", version);
-               nfs = find_nfs_version(version);
+               nfs = __find_nfs_version(version);
        }
 
        if (!IS_ERR(nfs) && !try_module_get(nfs->owner))

diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index 7e000d782e2831fa96e63e1a3ac74e028d813715..d553daa4c09ca35a4a11d7d7d6d91109f2014d73 100644 (file)
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -1467,7 +1467,7 @@ static int nfs_fs_context_validate(struct fs_context *fc)
 
        /* Load the NFS protocol module if we haven't done so yet */
        if (!ctx->nfs_mod) {
-               nfs_mod = get_nfs_version(ctx->version);
+               nfs_mod = find_nfs_version(ctx->version);
                if (IS_ERR(nfs_mod)) {
                        ret = PTR_ERR(nfs_mod);
                        goto out_version_unavailable;

diff --git a/fs/nfs/nfs.h b/fs/nfs/nfs.h
index 0329fc3023d0ff91dd2b94d734df3b44a130aa0e..a30bf8ef79d7de915592fc5afcab6076bd0bfb13 100644 (file)
--- a/fs/nfs/nfs.h
+++ b/fs/nfs/nfs.h
@@ -21,7 +21,7 @@ struct nfs_subversion {
        const struct xattr_handler * const *xattr;      /* NFS xattr handlers */
 };
 
-struct nfs_subversion *get_nfs_version(unsigned int);
+struct nfs_subversion *find_nfs_version(unsigned int);
 void put_nfs_version(struct nfs_subversion *);
 void register_nfs_version(struct nfs_subversion *);
 void unregister_nfs_version(struct nfs_subversion *);