[PATCH] xprtrdma: use offset_in_page() macro

[Geliang Tang]

Use offset_in_page() macro instead of open-coding.

Signed-off-by: Geliang Tang <geliangt...@gmail.com>
---
 net/sunrpc/xprtrdma/rpc_rdma.c        | 4 ++--
 net/sunrpc/xprtrdma/svc_rdma_sendto.c | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
index a044be2..429beea 100644
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -540,7 +540,7 @@ rpcrdma_prepare_msg_sges(struct rpcrdma_ia *ia, struct 
rpcrdma_req *req,
                        goto out;
 
                page = virt_to_page(xdr->tail[0].iov_base);
-               page_base = (unsigned long)xdr->tail[0].iov_base & ~PAGE_MASK;
+               page_base = offset_in_page(xdr->tail[0].iov_base);
 
                /* If the content in the page list is an odd length,
                 * xdr_write_pages() has added a pad at the beginning
@@ -587,7 +587,7 @@ rpcrdma_prepare_msg_sges(struct rpcrdma_ia *ia, struct 
rpcrdma_req *req,
         */
        if (xdr->tail[0].iov_len) {
                page = virt_to_page(xdr->tail[0].iov_base);
-               page_base = (unsigned long)xdr->tail[0].iov_base & ~PAGE_MASK;
+               page_base = offset_in_page(xdr->tail[0].iov_base);
                len = xdr->tail[0].iov_len;
 
 map_tail:
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c 
b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index 1736337..60b3f29 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -306,12 +306,11 @@ static int svc_rdma_dma_map_buf(struct svcxprt_rdma *rdma,
                                unsigned char *base,
                                unsigned int len)
 {
-       unsigned long offset = (unsigned long)base & ~PAGE_MASK;
        struct ib_device *dev = rdma->sc_cm_id->device;
        dma_addr_t dma_addr;
 
        dma_addr = ib_dma_map_page(dev, virt_to_page(base),
-                                  offset, len, DMA_TO_DEVICE);
+                                  offset_in_page(base), len, DMA_TO_DEVICE);
        if (ib_dma_mapping_error(dev, dma_addr))
                return -EIO;
 
-- 
2.9.3