Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52db6f9a authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

SUNRPC: Avoid digging into the ATOMIC pool 



Page allocation requests made when the SPARSE_PAGES flag is set are
allowed to fail, and are not critical. No need to spend a rare
resource.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent ce96e888

net/sunrpc/socklib.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct xdr_skb 
		/* ACL likes to be lazy in allocating pages - ACLs

		 * are small by default but can get huge. */

		if ((xdr->flags & XDRBUF_SPARSE_PAGES) && *ppage == NULL) {

			*ppage = alloc_page(GFP_ATOMIC);

			*ppage = alloc_page(GFP_NOWAIT | __GFP_NOWARN);

			if (unlikely(*ppage == NULL)) {

				if (copied == 0)

					copied = -ENOMEM;

net/sunrpc/xprtrdma/rpc_rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ rpcrdma_convert_iovs(struct rpcrdma_xprt *r_xprt, struct xdr_buf *xdrbuf, 
		 */

		if (unlikely(xdrbuf->flags & XDRBUF_SPARSE_PAGES)) {

			if (!*ppages)

				*ppages = alloc_page(GFP_ATOMIC);

				*ppages = alloc_page(GFP_NOWAIT | __GFP_NOWARN);

			if (!*ppages)

				return -ENOBUFS;

		}