From patchwork Sat Apr 22 01:21:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 9694059 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 29C0E600CA for ; Sat, 22 Apr 2017 01:23:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AF6F2867E for ; Sat, 22 Apr 2017 01:23:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EFE528688; Sat, 22 Apr 2017 01:23:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6C8B2867E for ; Sat, 22 Apr 2017 01:23:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162561AbdDVBW7 (ORCPT ); Fri, 21 Apr 2017 21:22:59 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:34099 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1042996AbdDVBWj (ORCPT ); Fri, 21 Apr 2017 21:22:39 -0400 Received: by mail-io0-f196.google.com with SMTP id h41so35317073ioi.1; Fri, 21 Apr 2017 18:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6IO7//WRUOImlrQNdQldAEnPBBpUDTiswF7hFfJmsXc=; b=aP/noHDYE4tLaCRzpZMTbyXbs5Al/iJP+LANZCYMPbBZsrlaBTflPH9cm+JTXMf5vK K9ByfywaBjlZ+lauKbJqVUbPKtf1+bNW42GdT522N0s6S2t7QrqqFlUeeP/Y4u2CL1Q8 L5spjtb9dPVBYSLcc5ef74Ki+vlRS3tm+WrnLPBWff3kY7IEP0l22OOhLjyXlatUeB52 Ck6nlcX/v7xP8cfwGrm3x0UL9/mMywAIyrjzdFfFPNihTg0gxc3Y+ayeJMo3dqmrt8GK uoQyevVhvLAkmoIfinA3vj4HAQavIIzTgFKHgH32aWG7J0Hof4y3AXqHWNTa+pT7FngJ fPpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6IO7//WRUOImlrQNdQldAEnPBBpUDTiswF7hFfJmsXc=; b=B1H+qKhP08hNBFMZWxhbRqZzUUXjuEZTf0mUODa4ofMiJgrr6249MiKXIBuz9zrL+x b+Z9OY1f67Zr0wA5qk0sMUtMXTtBzhiej4oTRmf2D4L1rhxS/tHf7QjQWaHKUApt7mu0 ZH0of/FCzR3R5ZnQa/b+XP4xr4BuT8KP0U0fdqXqHixKcKBb0V6kObrpIsjkDmEKXSol PUvxD3B3rpHGPyalPsfJPjeIECXqJW9fDiP2NMsW4SCH7rUHbkNcOZi8FBGIZycygJp9 h9smL0e4Gk0is9fH1+tN0o3mMGuh9JQ10xOISmKQZYXVjLfK6Gw6pDWayB0glI5kBaZC rhYQ== X-Gm-Message-State: AN3rC/6KA9TS5J/Jd/D9+nBW9iwf9uHvSWnROJE47hf8BqXyT0zysBIA PGdQRL/dXzWAeA== X-Received: by 10.98.41.199 with SMTP id p190mr14766468pfp.266.1492824153966; Fri, 21 Apr 2017 18:22:33 -0700 (PDT) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id z123sm18072973pfz.56.2017.04.21.18.22.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Apr 2017 18:22:33 -0700 (PDT) From: Geliang Tang To: "J. Bruce Fields" , Jeff Layton , Trond Myklebust , Anna Schumaker , "David S. Miller" , Chuck Lever , Sagi Grimberg Cc: Geliang Tang , linux-nfs@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] xprtrdma: use offset_in_page() macro Date: Sat, 22 Apr 2017 09:21:14 +0800 Message-Id: <1b5bf5bd903ad97138a3a86aa6bcb9b2fc142c6e.1492762974.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <4dbc77ccaaed98b183cf4dba58a4fa325fd65048.1492758503.git.geliangtang@gmail.com> References: <4dbc77ccaaed98b183cf4dba58a4fa325fd65048.1492758503.git.geliangtang@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use offset_in_page() macro instead of open-coding. Signed-off-by: Geliang Tang --- 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;