diff options
author | 2023-01-10 15:03:06 -0600 | |
---|---|---|
committer | 2023-01-10 15:03:06 -0600 | |
commit | 7dd4b804e08041ff56c88bdd8da742d14b17ed25 (patch) | |
tree | b6059ad50a8c4e0cd8ba880775bbb94af8f2643c /fs/nfsd/nfs4state.c | |
parent | Merge tag 'xtensa-20230110' of https://github.com/jcmvbkbc/linux-xtensa (diff) | |
parent | NFSD: Use set_bit(RQ_DROPME) (diff) | |
download | linux-7dd4b804e08041ff56c88bdd8da742d14b17ed25.tar.gz linux-7dd4b804e08041ff56c88bdd8da742d14b17ed25.tar.bz2 linux-7dd4b804e08041ff56c88bdd8da742d14b17ed25.zip |
Merge tag 'nfsd-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- Fix a race when creating NFSv4 files
- Revert the use of relaxed bitops
* tag 'nfsd-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
NFSD: Use set_bit(RQ_DROPME)
Revert "SUNRPC: Use RMW bitops in single-threaded hot paths"
nfsd: fix handling of cached open files in nfsd4_open codepath
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 7b2ee535ade8..4809ae0f0138 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5262,18 +5262,10 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp, if (!fp->fi_fds[oflag]) { spin_unlock(&fp->fi_lock); - if (!open->op_filp) { - status = nfsd_file_acquire(rqstp, cur_fh, access, &nf); - if (status != nfs_ok) - goto out_put_access; - } else { - status = nfsd_file_create(rqstp, cur_fh, access, &nf); - if (status != nfs_ok) - goto out_put_access; - nf->nf_file = open->op_filp; - open->op_filp = NULL; - trace_nfsd_file_create(rqstp, access, nf); - } + status = nfsd_file_acquire_opened(rqstp, cur_fh, access, + open->op_filp, &nf); + if (status != nfs_ok) + goto out_put_access; spin_lock(&fp->fi_lock); if (!fp->fi_fds[oflag]) { |