Skip to content

Commit df50b5e

Browse files
Anna SchumakerTrond Myklebust
authored andcommitted
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 <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
1 parent 11eb537 commit df50b5e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

fs/nfs/client.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const struct rpc_program nfs_program = {
8080
.pipe_dir_name = NFS_PIPE_DIRNAME,
8181
};
8282

83-
static struct nfs_subversion *find_nfs_version(unsigned int version)
83+
static struct nfs_subversion *__find_nfs_version(unsigned int version)
8484
{
8585
struct nfs_subversion *nfs;
8686

@@ -93,13 +93,13 @@ static struct nfs_subversion *find_nfs_version(unsigned int version)
9393
return nfs;
9494
}
9595

96-
struct nfs_subversion *get_nfs_version(unsigned int version)
96+
struct nfs_subversion *find_nfs_version(unsigned int version)
9797
{
98-
struct nfs_subversion *nfs = find_nfs_version(version);
98+
struct nfs_subversion *nfs = __find_nfs_version(version);
9999

100100
if (IS_ERR(nfs)) {
101101
request_module("nfsv%d", version);
102-
nfs = find_nfs_version(version);
102+
nfs = __find_nfs_version(version);
103103
}
104104

105105
if (!IS_ERR(nfs) && !try_module_get(nfs->owner))

fs/nfs/fs_context.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1467,7 +1467,7 @@ static int nfs_fs_context_validate(struct fs_context *fc)
14671467

14681468
/* Load the NFS protocol module if we haven't done so yet */
14691469
if (!ctx->nfs_mod) {
1470-
nfs_mod = get_nfs_version(ctx->version);
1470+
nfs_mod = find_nfs_version(ctx->version);
14711471
if (IS_ERR(nfs_mod)) {
14721472
ret = PTR_ERR(nfs_mod);
14731473
goto out_version_unavailable;

fs/nfs/nfs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ struct nfs_subversion {
2121
const struct xattr_handler * const *xattr; /* NFS xattr handlers */
2222
};
2323

24-
struct nfs_subversion *get_nfs_version(unsigned int);
24+
struct nfs_subversion *find_nfs_version(unsigned int);
2525
void put_nfs_version(struct nfs_subversion *);
2626
void register_nfs_version(struct nfs_subversion *);
2727
void unregister_nfs_version(struct nfs_subversion *);

0 commit comments

Comments
 (0)