Commit f0743c2b authored by Chuck Lever's avatar Chuck Lever

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: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent cb7ec76e
...@@ -168,8 +168,7 @@ nfsd_file_mark_find_or_create(struct nfsd_file *nf) ...@@ -168,8 +168,7 @@ nfsd_file_mark_find_or_create(struct nfsd_file *nf)
} }
static struct nfsd_file * static struct nfsd_file *
nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval, nfsd_file_alloc(struct inode *inode, unsigned int may, struct net *net)
struct net *net)
{ {
struct nfsd_file *nf; struct nfsd_file *nf;
...@@ -183,7 +182,6 @@ nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval, ...@@ -183,7 +182,6 @@ nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval,
nf->nf_net = net; nf->nf_net = net;
nf->nf_flags = 0; nf->nf_flags = 0;
nf->nf_inode = inode; nf->nf_inode = inode;
nf->nf_hashval = hashval;
refcount_set(&nf->nf_ref, 1); refcount_set(&nf->nf_ref, 1);
nf->nf_may = may & NFSD_FILE_MAY_MASK; nf->nf_may = may & NFSD_FILE_MAY_MASK;
nf->nf_mark = NULL; nf->nf_mark = NULL;
...@@ -1006,7 +1004,7 @@ nfsd_do_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, ...@@ -1006,7 +1004,7 @@ nfsd_do_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,
if (nf) if (nf)
goto wait_for_construction; goto wait_for_construction;
new = nfsd_file_alloc(inode, may_flags, hashval, net); new = nfsd_file_alloc(inode, may_flags, net);
if (!new) { if (!new) {
status = nfserr_jukebox; status = nfserr_jukebox;
goto out_status; goto out_status;
......
...@@ -40,7 +40,6 @@ struct nfsd_file { ...@@ -40,7 +40,6 @@ struct nfsd_file {
#define NFSD_FILE_REFERENCED (2) #define NFSD_FILE_REFERENCED (2)
unsigned long nf_flags; unsigned long nf_flags;
struct inode *nf_inode; struct inode *nf_inode;
unsigned int nf_hashval;
refcount_t nf_ref; refcount_t nf_ref;
unsigned char nf_may; unsigned char nf_may;
struct nfsd_file_mark *nf_mark; struct nfsd_file_mark *nf_mark;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment