Skip to content

Commit

Permalink
nfsd: Clean up nfsd_file_put()
Browse files Browse the repository at this point in the history
Make it a little less racy, by removing the refcount_read() test. Then
remove the redundant 'is_hashed' variable.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
  • Loading branch information
Trond Myklebust authored and Chuck Lever committed Mar 31, 2022
1 parent 6b8a943 commit 9993979
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions fs/nfsd/filecache.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,21 +301,14 @@ nfsd_file_put_noref(struct nfsd_file *nf)
void
nfsd_file_put(struct nfsd_file *nf)
{
bool is_hashed;

set_bit(NFSD_FILE_REFERENCED, &nf->nf_flags);
if (refcount_read(&nf->nf_ref) > 2 || !nf->nf_file) {
nfsd_file_put_noref(nf);
return;
}

is_hashed = test_bit(NFSD_FILE_HASHED, &nf->nf_flags) != 0;
if (!is_hashed) {
if (test_bit(NFSD_FILE_HASHED, &nf->nf_flags) == 0) {
nfsd_file_flush(nf);
nfsd_file_put_noref(nf);
} else {
nfsd_file_put_noref(nf);
nfsd_file_schedule_laundrette();
if (nf->nf_file)
nfsd_file_schedule_laundrette();
}
if (atomic_long_read(&nfsd_filecache_count) >= NFSD_FILE_LRU_LIMIT)
nfsd_file_gc();
Expand Down

0 comments on commit 9993979

Please sign in to comment.