Skip to content

Commit 3ff54d4

Browse files
chuckleversmb49
authored andcommitted
NFSD: Remove nfsd_file::nf_hashval
BugLink: https://bugs.launchpad.net/bugs/2065435 [ Upstream commit f0743c2 ] 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> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent 9bc0c3c commit 3ff54d4

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

fs/nfsd/filecache.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ nfsd_file_mark_find_or_create(struct nfsd_file *nf)
167167
}
168168

169169
static struct nfsd_file *
170-
nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval,
171-
struct net *net)
170+
nfsd_file_alloc(struct inode *inode, unsigned int may, struct net *net)
172171
{
173172
struct nfsd_file *nf;
174173

@@ -182,7 +181,6 @@ nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval,
182181
nf->nf_net = net;
183182
nf->nf_flags = 0;
184183
nf->nf_inode = inode;
185-
nf->nf_hashval = hashval;
186184
refcount_set(&nf->nf_ref, 1);
187185
nf->nf_may = may & NFSD_FILE_MAY_MASK;
188186
nf->nf_mark = NULL;
@@ -1005,7 +1003,7 @@ nfsd_do_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,
10051003
if (nf)
10061004
goto wait_for_construction;
10071005

1008-
new = nfsd_file_alloc(inode, may_flags, hashval, net);
1006+
new = nfsd_file_alloc(inode, may_flags, net);
10091007
if (!new) {
10101008
status = nfserr_jukebox;
10111009
goto out_status;

fs/nfsd/filecache.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ struct nfsd_file {
4040
#define NFSD_FILE_REFERENCED (2)
4141
unsigned long nf_flags;
4242
struct inode *nf_inode;
43-
unsigned int nf_hashval;
4443
refcount_t nf_ref;
4544
unsigned char nf_may;
4645
struct nfsd_file_mark *nf_mark;

0 commit comments

Comments
 (0)