sugar/linux
1
0
Fork 0
Code Activity

NFS: Clean up find_nfs_version()

Browse Source 
It's good practice to check the return value of request_module() to see
if the module has been found. It's also a little easier to follow the
code if __find_nfs_version() doesn't attempt to convert NULL pointers
into -EPROTONOSUPPORT.

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:43 -04:00
committed by Trond Myklebust
parent df50b5ee05
commit 3c91e4b7ae
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfs/client.c
View File

@@ -87,9 +87,6 @@ static struct nfs_subversion *__find_nfs_version(unsigned int version)
read_lock(&nfs_version_lock);
nfs = nfs_version_mods[version];
read_unlock(&nfs_version_lock);
if (nfs == NULL)
return ERR_PTR(-EPROTONOSUPPORT);
return nfs;
}
@@ -97,13 +94,15 @@ struct nfs_subversion *find_nfs_version(unsigned int version)
{
struct nfs_subversion *nfs = __find_nfs_version(version);
if (IS_ERR(nfs)) {
request_module("nfsv%d", version);
if (!nfs && request_module("nfsv%d", version) == 0)
nfs = __find_nfs_version(version);
}
if (!IS_ERR(nfs) && !try_module_get(nfs->owner))
if (!nfs)
return ERR_PTR(-EPROTONOSUPPORT);
if (!try_module_get(nfs->owner))
return ERR_PTR(-EAGAIN);
return nfs;
}