From: Chuck Lever <chuck.lever@oracle.com>
To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v1 17/17] svcrdma: use offset_in_page() macro
Date: Tue, 30 May 2017 14:16:18 -0400 [thread overview]
Message-ID: <20170530181618.2992.39799.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <20170530175808.2992.60365.stgit@klimt.1015granger.net>
Clean up: Use offset_in_page() macro instead of open-coding.
Reported-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
net/sunrpc/xprtrdma/svc_rdma_rw.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c
index d91ef56..4276c1c 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_rw.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c
@@ -371,8 +371,9 @@ static void svc_rdma_pagelist_to_sg(struct svc_rdma_write_info *info,
struct scatterlist *sg;
struct page **page;
- page_off = (info->wi_next_off + xdr->page_base) & ~PAGE_MASK;
- page_no = (info->wi_next_off + xdr->page_base) >> PAGE_SHIFT;
+ page_off = info->wi_next_off + xdr->page_base;
+ page_no = page_off >> PAGE_SHIFT;
+ page_off = offset_in_page(page_off);
page = xdr->pages + page_no;
info->wi_next_off += remaining;
sg = ctxt->rw_sg_table.sgl;
prev parent reply other threads:[~2017-05-30 18:16 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-30 18:14 [PATCH v1 00/17] Server-side NFS/RDMA changes proposed for v4.13 Chuck Lever
2017-05-30 18:14 ` [PATCH v1 01/17] ib_core: Enable and expose force_mr module parameter Chuck Lever
2017-05-31 4:36 ` Leon Romanovsky
2017-05-30 18:14 ` [PATCH v1 02/17] svcrdma: Squelch disconnection messages Chuck Lever
2017-05-30 18:14 ` [PATCH v1 03/17] svcrdma: Avoid Send Queue overflow Chuck Lever
2017-05-30 18:14 ` [PATCH v1 04/17] svcrdma: Remove svc_rdma_marshal.c Chuck Lever
2017-05-30 18:14 ` [PATCH v1 05/17] svcrdma: Improve Read chunk sanity checking Chuck Lever
2017-05-30 18:14 ` [PATCH v1 06/17] svcrdma: Improve Write " Chuck Lever
2017-05-30 18:14 ` [PATCH v1 07/17] svcrdma: Improve Reply " Chuck Lever
2017-05-30 18:15 ` [PATCH v1 08/17] svcrdma: Don't account for Receive queue "starvation" Chuck Lever
2017-05-30 18:15 ` [PATCH v1 09/17] sunrpc: Allocate one more page per svc_rqst Chuck Lever
2017-05-30 18:15 ` [PATCH v1 10/17] svcrdma: Add recvfrom helpers to svc_rdma_rw.c Chuck Lever
2017-05-30 18:15 ` [PATCH v1 11/17] svcrdma: Use generic RDMA R/W API in RPC Call path Chuck Lever
2017-05-30 18:15 ` [PATCH v1 12/17] svcrdma: Properly compute .len and .buflen for received RPC Calls Chuck Lever
2017-05-30 18:15 ` [PATCH v1 13/17] svcrdma: Remove unused Read completion handlers Chuck Lever
2017-05-30 18:15 ` [PATCH v1 14/17] svcrdma: Remove frmr cache Chuck Lever
2017-05-30 18:16 ` [PATCH v1 15/17] svcrdma: Clean-up svc_rdma_unmap_dma Chuck Lever
2017-05-30 18:16 ` [PATCH v1 16/17] svcrdma: Clean up after converting svc_rdma_recvfrom to rdma_rw API Chuck Lever
2017-05-30 18:16 ` Chuck Lever [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170530181618.2992.39799.stgit@klimt.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).