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

Commit 38aa0a59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.3-1' of git://linux-nfs.org/~bfields/linux 

Pull nfsd bugfix from Bruce Fields:
 "Just one RDMA bugfix"

* tag 'nfsd-4.3-1' of git://linux-nfs.org/~bfields/linux:
  svcrdma: handle rdma read with a non-zero initial page offset
parents 5163ac76 c91aed98

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+4 −2
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt, 
	ctxt->direction = DMA_FROM_DEVICE;

	ctxt->read_hdr = head;

	pages_needed = min_t(int, pages_needed, xprt->sc_max_sge_rd);

	read = min_t(int, pages_needed << PAGE_SHIFT, rs_length);

	read = min_t(int, (pages_needed << PAGE_SHIFT) - *page_offset,

		     rs_length);



	for (pno = 0; pno < pages_needed; pno++) {

		int len = min_t(int, rs_length, PAGE_SIZE - pg_off);
@@ -235,7 +236,8 @@ int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt, 
	ctxt->direction = DMA_FROM_DEVICE;

	ctxt->frmr = frmr;

	pages_needed = min_t(int, pages_needed, xprt->sc_frmr_pg_list_len);

	read = min_t(int, pages_needed << PAGE_SHIFT, rs_length);

	read = min_t(int, (pages_needed << PAGE_SHIFT) - *page_offset,

		     rs_length);



	frmr->kva = page_address(rqstp->rq_arg.pages[pg_no]);

	frmr->direction = DMA_FROM_DEVICE;