From patchwork Tue Sep 20 18:33:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9342257 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 D9B8060B16 for ; Tue, 20 Sep 2016 18:33:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2DBE299DF for ; Tue, 20 Sep 2016 18:33:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7EF529A0C; Tue, 20 Sep 2016 18:33:51 +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 6D44629A00 for ; Tue, 20 Sep 2016 18:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752603AbcITSdu (ORCPT ); Tue, 20 Sep 2016 14:33:50 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:35804 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752045AbcITSdt (ORCPT ); Tue, 20 Sep 2016 14:33:49 -0400 Received: by mail-qk0-f194.google.com with SMTP id w204so1596264qka.2 for ; Tue, 20 Sep 2016 11:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=8p+oE5QaYhpQtUvbFeO9JmXO8twF64tcMGPukSb3Vn4=; b=JXAqHL2HlYDWvdjpcZFuNoVf5jVTZizrGrxEJTxYcEmMSORC5pqy3ObAtXmdPVvXSI 4KvVea+vQBy576ODMsc57gscqMR9Rg+YUB8NUf8xZqcu5eAupkTyOsnzkELgVwLAZ/Wn rcwlPZ+rLhjgndK10jOK08u2I5+/80DsXzIxk/eOBLNvssZMcSeYzPpo4QLuKU5ogKIC Qp04Pklqx5rU7jF9X49P70RefPRDkGbTzWUyOcVlYW68HT9qWC91SFIlIgPcg/Vta6hk 50pmBnFP/c78XHQUgOygoz4Sk061CkxTnPD+abaxwrfr1OfRW7prluFkI/umjQ/eR+vR tQcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=8p+oE5QaYhpQtUvbFeO9JmXO8twF64tcMGPukSb3Vn4=; b=nNNBQzGagcsuwHty9YKp3zCAPSE1WfxZEnY1U6Z8USKUObedN4gekSU2uHvLeUKuTV spZzePXhN1cm5Oypc2mjpy+hIzJi0K9n06l29b31hOPEKYHKGRlYeGU+EIe0bJz/ppD+ 9YkiwGFcFbY/AVx7lVH0hzBWbnvA7ZosoAk+AY3zOCdrH42GFtpIakN+GMsRPVruV3zQ y1fTg5UCKEnepNH/3++OWj32M/xoE6DbBPMCTEhdbswfgcdDeYQV9OkMI5PS59XY1vGk Cvm1WHoGbxk2eXoy90T8VsxMyRPRSBkdXHu8DNbTzEAOua3yaPjZgKXNRIPxctrkDp00 vIQA== X-Gm-Message-State: AE9vXwNAWirEi5h10WI+nnGQLqTALhsiRpNvkaxgQnLvr6Co94i2ctvTztKpLYPvkD0obg== X-Received: by 10.55.110.199 with SMTP id j190mr39214059qkc.203.1474396428922; Tue, 20 Sep 2016 11:33:48 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-108-86-94.adr01.mskg.mi.frontiernet.net. [50.108.86.94]) by smtp.gmail.com with ESMTPSA id j67sm16716484qkf.41.2016.09.20.11.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 11:33:48 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] SUNRPC: Fix setting of buffer length in xdr_set_next_buffer() Date: Tue, 20 Sep 2016 14:33:43 -0400 Message-Id: <1474396423-19543-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474396423-19543-1-git-send-email-trond.myklebust@primarydata.com> References: <1474396423-19543-1-git-send-email-trond.myklebust@primarydata.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 xdr->nwords to tell us how much buffer remains. Signed-off-by: Trond Myklebust --- net/sunrpc/xdr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index b8444860edf5..7f1071e103ca 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -767,7 +767,7 @@ static void xdr_set_next_page(struct xdr_stream *xdr) newbase -= xdr->buf->page_base; if (xdr_set_page_base(xdr, newbase, PAGE_SIZE) < 0) - xdr_set_iov(xdr, xdr->buf->tail, xdr->buf->len); + xdr_set_iov(xdr, xdr->buf->tail, xdr->nwords << 2); } static bool xdr_set_next_buffer(struct xdr_stream *xdr) @@ -776,7 +776,7 @@ static bool xdr_set_next_buffer(struct xdr_stream *xdr) xdr_set_next_page(xdr); else if (xdr->iov == xdr->buf->head) { if (xdr_set_page_base(xdr, 0, PAGE_SIZE) < 0) - xdr_set_iov(xdr, xdr->buf->tail, xdr->buf->len); + xdr_set_iov(xdr, xdr->buf->tail, xdr->nwords << 2); } return xdr->p != xdr->end; }