From patchwork Tue May 23 14:55:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9742937 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 90AF06032C for ; Tue, 23 May 2017 14:55:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8459A28651 for ; Tue, 23 May 2017 14:55:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79457286F2; Tue, 23 May 2017 14:55:15 +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_SIGNED, 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 162B928651 for ; Tue, 23 May 2017 14:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760447AbdEWOzN (ORCPT ); Tue, 23 May 2017 10:55:13 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:33984 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759269AbdEWOzJ (ORCPT ); Tue, 23 May 2017 10:55:09 -0400 Received: by mail-io0-f193.google.com with SMTP id 12so15723490iol.1; Tue, 23 May 2017 07:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=K2sHA23T4pgR1rnHijmdpkh/lcLYdNdxz5fEyqgm1Ks=; b=Udnoz+T9uq7qfNB0d/SZ1h3EVJvmxpj8hWDSAkRabpv5bwWRCR8Kjd7ePIHBDNCN16 2i0PPEQjcIcSGUGVZHVtWt6GqDaNrcWD4Y9J+Qix8+6P1d//J5hpFZc/kbtM0oR6rPjo j1Vv4Anj26xjesRsYF+5a3RHqR7ITR4GtMqPrXsIdiyfz4FL5y5MwK/Tp9VCOOqvlqPU E7zYTZgz3A4F6UVhqi+qWTxWFyhyfXILGQowRfymrKzSTGRfUxwCQgSsR+cJff1qC82D TPm+jKG+p3njx4ciPE+aAnfUjgooDJh3T6vMozNrV915jMRQwigUWsummltvxDwqHnhh e1Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=K2sHA23T4pgR1rnHijmdpkh/lcLYdNdxz5fEyqgm1Ks=; b=XjE2bAyrmNICBcRVmjcK9cazeLC7XU9pCccfbp077alhlLWVF5kYxwsZChkP26KNoI FY7RNJvqhKEERNZ7CTC6Z31P3T5DhHOn7L7prPa/3x1xGfYGhDONDgS9jAzUPWwPZ+op GfTNxfOWzeMR1R57hProVW/qlT+ILrBuieTXnrY3iVR2d7AAkksRGF8Az2mqIFrqsUlN 1CA9HGry1S1VDhI0DiRO679h3LvC9sFKkML/44ZzyTtjVVt2sdipz5XlqG7D7UczCAyp 59m/VDxfjVC85e5wetyYmMTuYXtc1s7putyBK4ihZXCoDbMPIJMgCMvoonoKVuZm+hF4 LjPw== X-Gm-Message-State: AODbwcCojXPnsUHiPjqbMyYNLLDcPjxDK8Ohm7dgHIK7YknxjvDUAgjP EbFSw1saZS4rUFOc X-Received: by 10.107.166.85 with SMTP id p82mr27808343ioe.15.1495551308151; Tue, 23 May 2017 07:55:08 -0700 (PDT) Received: from manet.1015granger.net (c-68-46-169-226.hsd1.mi.comcast.net. [68.46.169.226]) by smtp.gmail.com with ESMTPSA id r79sm353216ioe.53.2017.05.23.07.55.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 07:55:07 -0700 (PDT) Subject: [PATCH v1 11/12] xprtrdma: Replace PAGE_MASK with offset_in_page() From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 23 May 2017 10:55:07 -0400 Message-ID: <20170523145507.961.11175.stgit@manet.1015granger.net> In-Reply-To: <20170523142629.961.81233.stgit@manet.1015granger.net> References: <20170523142629.961.81233.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 Clean up. Reported by: Geliang Tang Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/rpc_rdma.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index b6584ae..ca4d6e4 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -141,7 +141,7 @@ static bool rpcrdma_args_inline(struct rpcrdma_xprt *r_xprt, if (xdr->page_len) { remaining = xdr->page_len; - offset = xdr->page_base & ~PAGE_MASK; + offset = offset_in_page(xdr->page_base); count = 0; while (remaining) { remaining -= min_t(unsigned int, @@ -222,7 +222,7 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, len = xdrbuf->page_len; ppages = xdrbuf->pages + (xdrbuf->page_base >> PAGE_SHIFT); - page_base = xdrbuf->page_base & ~PAGE_MASK; + page_base = offset_in_page(xdrbuf->page_base); p = 0; while (len && n < RPCRDMA_MAX_SEGS) { if (!ppages[p]) { @@ -540,7 +540,7 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, 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 @@ -557,7 +557,7 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, */ if (xdr->page_len) { ppages = xdr->pages + (xdr->page_base >> PAGE_SHIFT); - page_base = xdr->page_base & ~PAGE_MASK; + page_base = offset_in_page(xdr->page_base); remaining = xdr->page_len; while (remaining) { sge_no++; @@ -587,7 +587,7 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, */ 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: @@ -878,9 +878,9 @@ static bool rpcrdma_results_inline(struct rpcrdma_xprt *r_xprt, srcp += curlen; copy_len -= curlen; - page_base = rqst->rq_rcv_buf.page_base; - ppages = rqst->rq_rcv_buf.pages + (page_base >> PAGE_SHIFT); - page_base &= ~PAGE_MASK; + ppages = rqst->rq_rcv_buf.pages + + (rqst->rq_rcv_buf.page_base >> PAGE_SHIFT); + page_base = offset_in_page(rqst->rq_rcv_buf.page_base); fixup_copy_count = 0; if (copy_len && rqst->rq_rcv_buf.page_len) { int pagelist_len;