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

Commit 15303d9e authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Recognize XDRBUF_SPARSE_PAGES 



Commit 431f6eb3 ("SUNRPC: Add a label for RPC calls that require
allocation on receive") didn't update similar logic in rpc_rdma.c.
I don't think this is a bug, per-se; the commit just adds more
careful checking for broken upper layer behavior.

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

net/sunrpc/xprtrdma/rpc_rdma.c

+6 −5
Original line number Diff line number Diff line
@@ -218,10 +218,11 @@ rpcrdma_convert_iovs(struct rpcrdma_xprt *r_xprt, struct xdr_buf *xdrbuf, 
	ppages = xdrbuf->pages + (xdrbuf->page_base >> PAGE_SHIFT);

	page_base = offset_in_page(xdrbuf->page_base);

	while (len) {

		if (unlikely(!*ppages)) {

			/* XXX: Certain upper layer operations do

			 *	not provide receive buffer pages.

		/* ACL likes to be lazy in allocating pages - ACLs

		 * are small by default but can get huge.

		 */

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

			if (!*ppages)

				*ppages = alloc_page(GFP_ATOMIC);

			if (!*ppages)

				return -ENOBUFS;