xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSD: nfsd_file_hash_remove can compute hashval

Browse Source 
[ Upstream commit cb7ec76e73ff6640241c8f1f2f35c81d4005a2d6 ]

Remove an unnecessary use of nf_hashval.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever
2022-07-08 14:26:03 -04:00
committed by Greg Kroah-Hartman
parent 10ba39f788
commit 12494d98fe
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/nfsd/filecache.c
View File

@@ -287,6 +287,18 @@ nfsd_file_do_unhash(struct nfsd_file *nf)
atomic_long_dec(&nfsd_filecache_count); atomic_long_dec(&nfsd_filecache_count);
} }
static void
nfsd_file_hash_remove(struct nfsd_file *nf)
{
struct inode *inode = nf->nf_inode;
unsigned int hashval = (unsigned int)hash_long(inode->i_ino,
NFSD_FILE_HASH_BITS);
spin_lock(&nfsd_file_hashtbl[hashval].nfb_lock);
nfsd_file_do_unhash(nf);
spin_unlock(&nfsd_file_hashtbl[hashval].nfb_lock);
}
static bool static bool
nfsd_file_unhash(struct nfsd_file *nf) nfsd_file_unhash(struct nfsd_file *nf)
{ {
@@ -506,11 +518,8 @@ static void nfsd_file_gc_dispose_list(struct list_head *dispose)
{ {
struct nfsd_file *nf; struct nfsd_file *nf;
list_for_each_entry(nf, dispose, nf_lru) { list_for_each_entry(nf, dispose, nf_lru)
spin_lock(&nfsd_file_hashtbl[nf->nf_hashval].nfb_lock); nfsd_file_hash_remove(nf);
nfsd_file_do_unhash(nf);
spin_unlock(&nfsd_file_hashtbl[nf->nf_hashval].nfb_lock);
}
nfsd_file_dispose_list_delayed(dispose); nfsd_file_dispose_list_delayed(dispose);
} }