Commit 3e5e6c99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-6.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd fixes from Chuck Lever:

 - Fix two async COPY bugs found during NFS bake-a-thon

 - Fix an svcrdma memory leak

* tag 'nfsd-6.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  rpcrdma: Always release the rpcrdma_device's xa_array
  NFSD: Never decrement pending_async_copies on error
  NFSD: Initialize struct nfsd4_copy earlier
parents f6a7b4ec 63a81588

fs/nfsd/nfs4proc.c

+3 −5
Original line number Diff line number Diff line
@@ -1841,14 +1841,12 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		if (!async_copy)

			goto out_err;

		async_copy->cp_nn = nn;

		INIT_LIST_HEAD(&async_copy->copies);

		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;

		}

		INIT_LIST_HEAD(&async_copy->copies);

		refcount_set(&async_copy->refcount, 1);

		async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL);

		if (!async_copy->cp_src)

			goto out_err;

net/sunrpc/xprtrdma/ib_client.c

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static void rpcrdma_remove_one(struct ib_device *device, 
	}



	trace_rpcrdma_client_remove_one_done(device);

	xa_destroy(&rd->rd_xa);

	kfree(rd);

}