diff options
| author | Trond Myklebust <trondmy@gmail.com> | 2020-01-06 13:18:03 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2020-01-22 16:25:01 -0500 |
| commit | 28c7d86bb6172ffbb1a1237c6388e77f9fe5f181 (patch) | |
| tree | 4e5ed40f9b2f92472307deb058a7a00f2ba78de7 /fs/nfsd | |
| parent | e44b4bf2648ef05ff1cde9f354079bce58a5ebde (diff) | |
| download | linux-stable-28c7d86bb6172ffbb1a1237c6388e77f9fe5f181.tar.gz linux-stable-28c7d86bb6172ffbb1a1237c6388e77f9fe5f181.tar.bz2 linux-stable-28c7d86bb6172ffbb1a1237c6388e77f9fe5f181.zip | |
nfsd: fix filecache lookup
If the lookup keeps finding a nfsd_file with an unhashed open file,
then retry once only.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org
Fixes: 65294c1f2c5e "nfsd: add a new struct file caching facility to nfsd"
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/filecache.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 32a9bf22ac08..0a3e5c2aac4b 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -789,6 +789,7 @@ nfsd_file_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf, *new; struct inode *inode; unsigned int hashval; + bool retry = true; /* FIXME: skip this if fh_dentry is already set? */ status = fh_verify(rqstp, fhp, S_IFREG, @@ -824,6 +825,11 @@ wait_for_construction: /* Did construction of this file fail? */ if (!test_bit(NFSD_FILE_HASHED, &nf->nf_flags)) { + if (!retry) { + status = nfserr_jukebox; + goto out; + } + retry = false; nfsd_file_put_noref(nf); goto retry; } |