NFSD: Remove nfsd_file::nf_hashval

The value in this field can always be computed from nf_inode, thus
it is no longer used.

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 0766f6f..1178cff 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -168,8 +168,7 @@ nfsd_file_mark_find_or_create(struct nfsd_file *nf)
 }
 
 static struct nfsd_file *
-nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval,
-               struct net *net)
+nfsd_file_alloc(struct inode *inode, unsigned int may, struct net *net)
 {
        struct nfsd_file *nf;
 
@@ -183,7 +182,6 @@ nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval,
                nf->nf_net = net;
                nf->nf_flags = 0;
                nf->nf_inode = inode;
-               nf->nf_hashval = hashval;
                refcount_set(&nf->nf_ref, 1);
                nf->nf_may = may & NFSD_FILE_MAY_MASK;
                nf->nf_mark = NULL;
@@ -1006,7 +1004,7 @@ retry:
        if (nf)
                goto wait_for_construction;
 
-       new = nfsd_file_alloc(inode, may_flags, hashval, net);
+       new = nfsd_file_alloc(inode, may_flags, net);
        if (!new) {
                status = nfserr_jukebox;
                goto out_status;

diff --git a/fs/nfsd/filecache.h b/fs/nfsd/filecache.h
index c6ad5fe..82051e1 100644 (file)
--- a/fs/nfsd/filecache.h
+++ b/fs/nfsd/filecache.h
@@ -40,7 +40,6 @@ struct nfsd_file {
 #define NFSD_FILE_REFERENCED   (2)
        unsigned long           nf_flags;
        struct inode            *nf_inode;
-       unsigned int            nf_hashval;
        refcount_t              nf_ref;
        unsigned char           nf_may;
        struct nfsd_file_mark   *nf_mark;