From patchwork Tue May 30 18:16:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9755079 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 DF6DA601D2 for ; Tue, 30 May 2017 18:16:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEC32267EC for ; Tue, 30 May 2017 18:16:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C373127FA5; Tue, 30 May 2017 18:16:22 +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 513D5267EC for ; Tue, 30 May 2017 18:16:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751202AbdE3SQV (ORCPT ); Tue, 30 May 2017 14:16:21 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:34381 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbdE3SQU (ORCPT ); Tue, 30 May 2017 14:16:20 -0400 Received: by mail-io0-f195.google.com with SMTP id 12so9820966iol.1; Tue, 30 May 2017 11:16:20 -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=gdIbTdCsTZDcaKEwFC8NlJ9bEyMmcQHJHnxNPuv+Bho=; b=oXHq//rGwHlNBpNVl9Tm6kuucMbw4cImYLatqah4QnZtOHnBUF1LUm3GhV9KkpD2tB G20+uaxQbq+EOrrTqPnmokaIK0hqRoZwGJzsR36dn1JiU0OgdpIFXL7scYrJRAElcF6m EdXLfU61fkOmpPZkBSnsWEmrlD7MMqrwrZR1g4BqCqYQLjOFhx96uadS+IXeLwpC5vrw bU/bHmnAxd+mEeM+8lc+DhW/KfOtcMewwkA5BYo/UbFzyUGj3bidRLEATiLOom5nczlj nQa5fktcaUSJtAhxWopngWuVi5CeAmU1hVWT1IdFQUIz/Aux53rTKThmmDP2Gg+p5o+K Ds/w== 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=gdIbTdCsTZDcaKEwFC8NlJ9bEyMmcQHJHnxNPuv+Bho=; b=FFFxrOc1rt1S5bvBbpsd6L8JklN5yXQ6CgXOjf/yrpXKG9er3kyC7tIlZH/DXmxOE9 TDwxKvgpBfgVVlaTFybIyGvN9FXoAv+b5k/jC29pRjzgxFdQtZ5jALoZKgxyXU1+718V 2Lg26zjohZsldb8QBDU3u3VE+viTYyhsxOqrkwPO9nSc75QsBH1WTjw17P9uPzRmIIz/ Wi2fw2Lj419wpDqPilw3hFAZUsx7NqqeNOCe4+lbtxjNYPvmI5X9G68RFNQUV6Io9Kjm 23PIrSTD1GmA+5tL5EZPQzZ5dy77BLE6QEFAXKqRfTdlF1xgJDmO9bC7/guDO1DfoOgY /cDA== X-Gm-Message-State: AODbwcDSuAIUJ5RXXKFQeKjiV+TyvkepIdWLIJwajpp4EH36KyDtV2hU v266l0Scwqyr6DNA X-Received: by 10.107.16.142 with SMTP id 14mr22531567ioq.134.1496168179591; Tue, 30 May 2017 11:16:19 -0700 (PDT) Received: from klimt.1015granger.net (c-68-46-169-226.hsd1.mi.comcast.net. [68.46.169.226]) by smtp.gmail.com with ESMTPSA id y79sm5842222iod.13.2017.05.30.11.16.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 May 2017 11:16:19 -0700 (PDT) Subject: [PATCH v1 17/17] svcrdma: use offset_in_page() macro From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 30 May 2017 14:16:18 -0400 Message-ID: <20170530181618.2992.39799.stgit@klimt.1015granger.net> In-Reply-To: <20170530175808.2992.60365.stgit@klimt.1015granger.net> References: <20170530175808.2992.60365.stgit@klimt.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: Use offset_in_page() macro instead of open-coding. Reported-by: Geliang Tang Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_rw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 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/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;