diff options
| author | Trond Myklebust <trondmy@gmail.com> | 2020-01-06 13:18:07 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2020-01-22 16:25:40 -0500 |
| commit | 55f84cc47f73bdc84ef73b702c23051b426505a4 (patch) | |
| tree | 7f8639d9066b0b817fc01f5f384c3387a740f54c | |
| parent | bd6e1cece834f1b1322c85269b93379f8092077f (diff) | |
| download | blackbird-op-linux-55f84cc47f73bdc84ef73b702c23051b426505a4.tar.gz blackbird-op-linux-55f84cc47f73bdc84ef73b702c23051b426505a4.zip | |
nfsd: Schedule the laundrette regularly irrespective of file errors
Emsure we schedule the laundrette even if the struct file is carrying
file errors.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/filecache.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 6b0ab43b0618..4cef03a7726c 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -237,13 +237,6 @@ nfsd_file_check_write_error(struct nfsd_file *nf) return filemap_check_wb_err(file->f_mapping, READ_ONCE(file->f_wb_err)); } -static bool -nfsd_file_in_use(struct nfsd_file *nf) -{ - return nfsd_file_check_writeback(nf) || - nfsd_file_check_write_error(nf); -} - static void nfsd_file_do_unhash(struct nfsd_file *nf) { @@ -307,10 +300,9 @@ void nfsd_file_put(struct nfsd_file *nf) { bool is_hashed = test_bit(NFSD_FILE_HASHED, &nf->nf_flags) != 0; - bool unused = !nfsd_file_in_use(nf); set_bit(NFSD_FILE_REFERENCED, &nf->nf_flags); - if (nfsd_file_put_noref(nf) == 1 && is_hashed && unused) + if (nfsd_file_put_noref(nf) == 1 && is_hashed) nfsd_file_schedule_laundrette(); if (atomic_long_read(&nfsd_filecache_count) >= NFSD_FILE_LRU_LIMIT) nfsd_file_gc(); |
