From patchwork Mon Oct 13 15:07:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5076871 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 380EA9F387 for ; Mon, 13 Oct 2014 15:07:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B917201B9 for ; Mon, 13 Oct 2014 15:07:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D561F20179 for ; Mon, 13 Oct 2014 15:07:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752509AbaJMPH1 (ORCPT ); Mon, 13 Oct 2014 11:07:27 -0400 Received: from mail-ig0-f175.google.com ([209.85.213.175]:39587 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752656AbaJMPH1 (ORCPT ); Mon, 13 Oct 2014 11:07:27 -0400 Received: by mail-ig0-f175.google.com with SMTP id uq10so10787464igb.2 for ; Mon, 13 Oct 2014 08:07:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fahDISzrFUYrW5/0Gp6iEV+OHOK4ACLPMD1ae4O7LQg=; b=TsS73ZyxyJ5lAcLNC0j/TuGhMqEFCRFp5N/CWjpyEdpwUA8pi2qZdIWNQrxUFXJXle h5HypylGNWFPVrJKDpi1kIR7fynT3tZzreBCNcXP0VqeRTKHUIQDVJBAJAD2vdmJsFTk 5rZnKFGMPNlFdDgnZ1Ov+9h0bvZ4fCA/zjFMKxeXSQ6hAjwWRY7xx+SRPQD2n/s6nt86 vce2cQFiHSxklW43Oy86BNNwupEjvr8sHwmX6UrW9SnpKezIuREf9n8rdVzWDrsPSC1C fDKPsO9DAQarCO1X7vpjEyp2gH3q70nSBPXGjm4ZjOstd2nszESatI6s64dXO6DeH98F zkJw== X-Gm-Message-State: ALoCoQnN8vBhmLhB5M/1oTsYo7+GqswO3Da82GncL0h6a5isxKwfwnGV25JQdtGINRLb5i9CGRhi X-Received: by 10.50.18.111 with SMTP id v15mr2041700igd.19.1413212846486; Mon, 13 Oct 2014 08:07:26 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-73-190-61-247.hsd1.mi.comcast.net. [73.190.61.247]) by mx.google.com with ESMTPSA id 8sm4038722igy.0.2014.10.13.08.07.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Oct 2014 08:07:25 -0700 (PDT) From: Trond Myklebust To: Steve Dickson Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH 2/2] NFS: Fix a bogus warning in nfs_generic_pgio Date: Mon, 13 Oct 2014 11:07:19 -0400 Message-Id: <1413212839-6665-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1413212839-6665-1-git-send-email-trond.myklebust@primarydata.com> References: <1413212839-6665-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-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is OK for pageused == pagecount in the loop, as long as we don't add another entry to the *pages array. Move the test so that it only triggers in that case. Reported-by: Steve Dickson Fixes: bba5c1887a92 (nfs: disallow duplicate pages in pgio page vectors) Cc: Weston Andros Adamson Cc: stable@vger.kernel.org # 3.16.x Signed-off-by: Trond Myklebust Tested-by: Steve Dickson --- fs/nfs/pagelist.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 08085de879ed..ed0db61f8543 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -752,12 +752,11 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, nfs_list_remove_request(req); nfs_list_add_request(req, &hdr->pages); - if (WARN_ON_ONCE(pageused >= pagecount)) - return nfs_pgio_error(desc, hdr); - if (!last_page || last_page != req->wb_page) { - *pages++ = last_page = req->wb_page; pageused++; + if (pageused > pagecount) + break; + *pages++ = last_page = req->wb_page; } } if (WARN_ON_ONCE(pageused != pagecount))