Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-08 15:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NFS: Rename get_nfs_version() -> find_nfs_version()

Browse Source 
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>
This commit is contained in:
Anna Schumaker 2024-10-01 16:33:42 -04:00 committed by Trond Myklebust
parent 11eb537fd8
commit df50b5ee05
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfs/client.c
View File

@ -80,7 +80,7 @@ const struct rpc_program nfs_program = {
.pipe_dir_name = NFS_PIPE_DIRNAME, .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; struct nfs_subversion *nfs;
@ -93,13 +93,13 @@ static struct nfs_subversion *find_nfs_version(unsigned int version)
return nfs; 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)) { if (IS_ERR(nfs)) {
request_module("nfsv%d", version); request_module("nfsv%d", version);
nfs = find_nfs_version(version); nfs = __find_nfs_version(version);
} }
if (!IS_ERR(nfs) && !try_module_get(nfs->owner)) if (!IS_ERR(nfs) && !try_module_get(nfs->owner))

2
fs/nfs/fs_context.c
View File

@ -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 */ /* Load the NFS protocol module if we haven't done so yet */
if (!ctx->nfs_mod) { if (!ctx->nfs_mod) {
nfs_mod = get_nfs_version(ctx->version); nfs_mod = find_nfs_version(ctx->version);
if (IS_ERR(nfs_mod)) { if (IS_ERR(nfs_mod)) {
ret = PTR_ERR(nfs_mod); ret = PTR_ERR(nfs_mod);
goto out_version_unavailable; goto out_version_unavailable;

2
fs/nfs/nfs.h
View File

@ -21,7 +21,7 @@ struct nfs_subversion {
const struct xattr_handler * const *xattr; /* NFS xattr handlers */ 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 put_nfs_version(struct nfs_subversion *);
void register_nfs_version(struct nfs_subversion *); void register_nfs_version(struct nfs_subversion *);
void unregister_nfs_version(struct nfs_subversion *); void unregister_nfs_version(struct nfs_subversion *);