]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
NFSD: Never decrement pending_async_copies on error
authorChuck Lever <chuck.lever@oracle.com>
Tue, 29 Oct 2024 19:27:19 +0000 (15:27 -0400)
committerChuck Lever <chuck.lever@oracle.com>
Wed, 30 Oct 2024 18:12:16 +0000 (14:12 -0400)
The error flow in nfsd4_copy() calls cleanup_async_copy(), which
already decrements nn->pending_async_copies.

Reported-by: Olga Kornievskaia <okorniev@redhat.com>
Fixes: aadc3bbea163 ("NFSD: Limit the number of concurrent async COPY operations")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/nfs4proc.c

index 5fd1ce3fc8fb7e638715ab6d9af21b5a73459977..d32f2dfd148fe3080006eb6346be7a69065a04f9 100644 (file)
@@ -1845,10 +1845,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                refcount_set(&async_copy->refcount, 1);
                /* Arbitrary cap on number of pending async copy operations */
                if (atomic_inc_return(&nn->pending_async_copies) >
-                               (int)rqstp->rq_pool->sp_nrthreads) {
-                       atomic_dec(&nn->pending_async_copies);
+                               (int)rqstp->rq_pool->sp_nrthreads)
                        goto out_err;
-               }
                async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);
                if (!async_copy->cp_src)
                        goto out_err;