MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-08 10:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfsd: don't kill nfsd_files because of lease break error

Browse Source 
An error from break_lease is non-fatal, so we needn't destroy the
nfsd_file in that case. Just put the reference like we normally would
and return the error.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Jeff Layton 2023-01-05 07:15:11 -05:00 committed by Chuck Lever
parent d69b8dbfd0
commit c6593366c0
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/nfsd/filecache.c
View File

@ -1102,7 +1102,7 @@ retry:
nf = nfsd_file_alloc(&key, may_flags); nf = nfsd_file_alloc(&key, may_flags);
if (!nf) { if (!nf) {
status = nfserr_jukebox; status = nfserr_jukebox;
goto out_status; goto out;
} }
ret = rhashtable_lookup_insert_key(&nfsd_file_rhash_tbl, ret = rhashtable_lookup_insert_key(&nfsd_file_rhash_tbl,
@ -1111,13 +1111,11 @@ retry:
if (likely(ret == 0)) if (likely(ret == 0))
goto open_file; goto open_file;
nfsd_file_slab_free(&nf->nf_rcu);
nf = NULL;
if (ret == -EEXIST) if (ret == -EEXIST)
goto retry; goto retry;
trace_nfsd_file_insert_err(rqstp, key.inode, may_flags, ret); trace_nfsd_file_insert_err(rqstp, key.inode, may_flags, ret);
status = nfserr_jukebox; status = nfserr_jukebox;
goto out_status; goto construction_err;
wait_for_construction: wait_for_construction:
wait_on_bit(&nf->nf_flags, NFSD_FILE_PENDING, TASK_UNINTERRUPTIBLE); wait_on_bit(&nf->nf_flags, NFSD_FILE_PENDING, TASK_UNINTERRUPTIBLE);
@ -1127,29 +1125,25 @@ wait_for_construction:
trace_nfsd_file_cons_err(rqstp, key.inode, may_flags, nf); trace_nfsd_file_cons_err(rqstp, key.inode, may_flags, nf);
if (!open_retry) { if (!open_retry) {
status = nfserr_jukebox; status = nfserr_jukebox;
goto out; goto construction_err;
} }
open_retry = false; open_retry = false;
if (refcount_dec_and_test(&nf->nf_ref))
nfsd_file_free(nf);
goto retry; goto retry;
} }
this_cpu_inc(nfsd_file_cache_hits); this_cpu_inc(nfsd_file_cache_hits);
status = nfserrno(nfsd_open_break_lease(file_inode(nf->nf_file), may_flags)); status = nfserrno(nfsd_open_break_lease(file_inode(nf->nf_file), may_flags));
if (status != nfs_ok) {
nfsd_file_put(nf);
nf = NULL;
}
out: out:
if (status == nfs_ok) { if (status == nfs_ok) {
this_cpu_inc(nfsd_file_acquisitions); this_cpu_inc(nfsd_file_acquisitions);
nfsd_file_check_write_error(nf); nfsd_file_check_write_error(nf);
*pnf = nf; *pnf = nf;
} else {
if (refcount_dec_and_test(&nf->nf_ref))
nfsd_file_free(nf);
nf = NULL;
} }
out_status:
put_cred(key.cred); put_cred(key.cred);
trace_nfsd_file_acquire(rqstp, key.inode, may_flags, nf, status); trace_nfsd_file_acquire(rqstp, key.inode, may_flags, nf, status);
return status; return status;
@ -1179,6 +1173,13 @@ open_file:
if (status != nfs_ok) if (status != nfs_ok)
nfsd_file_unhash(nf); nfsd_file_unhash(nf);
clear_and_wake_up_bit(NFSD_FILE_PENDING, &nf->nf_flags); clear_and_wake_up_bit(NFSD_FILE_PENDING, &nf->nf_flags);
if (status == nfs_ok)
goto out;
construction_err:
if (refcount_dec_and_test(&nf->nf_ref))
nfsd_file_free(nf);
nf = NULL;
goto out; goto out;
} }