NFSD: nfsd_file_unhash can compute hashval from nf->nf_inode

[ 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>

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index 6a01de86779597af7fb7e5ac2e8469563af02084..d7c74b51eabf375d0f0d7dc3cf376a9fd75e6db4 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -272,13 +272,17 @@ static void nfsd_file_lru_remove(struct nfsd_file *nf)
 static void
 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);
 
        if (nfsd_file_check_write_error(nf))
                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);
        atomic_long_dec(&nfsd_filecache_count);
 }