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

NFSD: nfsd_file_unhash can compute hashval from nf->nf_inode

Browse Source 
[ Upstream commit 8755326399f471ec3b31e2ab8c5074c0d28a0fb5 ]

Remove an unnecessary usage 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:25:50 -04:00
committed by Greg Kroah-Hartman
parent ef7fe4908a
commit a86953523e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfsd/filecache.c
View File

@@ -272,13 +272,17 @@ static void nfsd_file_lru_remove(struct nfsd_file *nf)
static void static void
nfsd_file_do_unhash(struct nfsd_file *nf) nfsd_file_do_unhash(struct nfsd_file *nf)
{ {
lockdep_assert_held(&nfsd_file_hashtbl[nf->nf_hashval].nfb_lock); struct inode *inode = nf->nf_inode;
unsigned int hashval = (unsigned int)hash_long(inode->i_ino,
NFSD_FILE_HASH_BITS);
lockdep_assert_held(&nfsd_file_hashtbl[hashval].nfb_lock);
trace_nfsd_file_unhash(nf); trace_nfsd_file_unhash(nf);
if (nfsd_file_check_write_error(nf)) if (nfsd_file_check_write_error(nf))
nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id)); nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id));
--nfsd_file_hashtbl[nf->nf_hashval].nfb_count; --nfsd_file_hashtbl[hashval].nfb_count;
hlist_del_rcu(&nf->nf_node); hlist_del_rcu(&nf->nf_node);
atomic_long_dec(&nfsd_filecache_count); atomic_long_dec(&nfsd_filecache_count);
} }