NFSD: Never decrement pending_async_copies on error
[ Upstream commit 8286f8b622990194207df9ab852e0f87c60d35e9 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
43e8476b54
commit
67e0c1b5a0
1 changed files with 1 additions and 3 deletions
|
@ -1787,10 +1787,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
|
||||||
refcount_set(&async_copy->refcount, 1);
|
refcount_set(&async_copy->refcount, 1);
|
||||||
/* Arbitrary cap on number of pending async copy operations */
|
/* Arbitrary cap on number of pending async copy operations */
|
||||||
if (atomic_inc_return(&nn->pending_async_copies) >
|
if (atomic_inc_return(&nn->pending_async_copies) >
|
||||||
(int)rqstp->rq_pool->sp_nrthreads) {
|
(int)rqstp->rq_pool->sp_nrthreads)
|
||||||
atomic_dec(&nn->pending_async_copies);
|
|
||||||
goto out_err;
|
goto out_err;
|
||||||
}
|
|
||||||
async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);
|
async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);
|
||||||
if (!async_copy->cp_src)
|
if (!async_copy->cp_src)
|
||||||
goto out_err;
|
goto out_err;
|
||||||
|
|
Loading…
Add table
Reference in a new issue