From patchwork Thu Aug 3 13:45:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9879153 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 08856603F4 for ; Thu, 3 Aug 2017 13:46:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F24CC28908 for ; Thu, 3 Aug 2017 13:46:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E72C528912; Thu, 3 Aug 2017 13:46:07 +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 8656928908 for ; Thu, 3 Aug 2017 13:46:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751958AbdHCNqE (ORCPT ); Thu, 3 Aug 2017 09:46:04 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:35243 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751942AbdHCNp5 (ORCPT ); Thu, 3 Aug 2017 09:45:57 -0400 Received: by mail-it0-f65.google.com with SMTP id v127so1319561itd.2 for ; Thu, 03 Aug 2017 06:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=8ISaZRCR/ZCe8p3hhdcrdDYlFXZMxgEHd0XmMjEaj5s=; b=NBOKrPEGcNqagf9m4Lg4U0/XDqayZ9/SWRPezkayFinbKzCNNLkPoIXu9m1mzML/xK wPvO/M6qv+bXAhlMt8Lc9e6st00dVb4tMT663cJRLDmAW8t+7GROl2IHygcj3/pmTdUn as0MECpVZUqLI82gz0fl/9scwBHaLF0N5Aq0qcaerGgBOJn/M5FlN0bvT1NKEctcm5vi qgE57UgChCeVwbkwQ64+xrjlocqtu/Lvavam8PN+RBs2uvas40Fj7Eh140M09Zn33lVW 8RQ6wfWZ48qxJEQ56ioWHbk/NG5a25f483Fh7kIKzZw0JAqeh/Y5PtRbv7KJTS2e0q2/ IA4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=8ISaZRCR/ZCe8p3hhdcrdDYlFXZMxgEHd0XmMjEaj5s=; b=owg6/GH/ihW2zDg+SOuJ6BOhx7qXgVGLTSK6WrsZO3Xg4QQAZWGmPvmgM28Q+mUWSB HGOHNBsjK8GnXGQsavvk3h6e6HzIbSQ5gIgrFJa2Fm3TzSJCy3cW1Cp8xm3/FQ0PqS62 6C2lCQziV7kaFuqYL5S1M2hkuci9SqrsCDcODwr5Ay6vnpZyBh6+ouTuxXVEDmpRCiPj uZc3irBuvlUrRT73toDqyk15y7GRYnO2ouOhZQKpssFXIwQubTgFl+zXV3LDRDWdTF5M L/RkUyQVlG9c5ggd345H/m2Dy3HVy6wHhqcIsOozYml639kPq+RKrlTCR/G2UaMgcK2h sFlg== X-Gm-Message-State: AIVw110Gh+hCXfjwcV0yVsNub0Ztz6FJZpftj9VGObNxxxFfygyR95ke nsVn6ZB2bdFJfA== X-Received: by 10.36.208.79 with SMTP id m76mr1767517itg.45.1501767956537; Thu, 03 Aug 2017 06:45:56 -0700 (PDT) Received: from localhost.localdomain (50-108-95-251.adr01.mskg.mi.frontiernet.net. [50.108.95.251]) by smtp.gmail.com with ESMTPSA id q90sm5759547ioi.41.2017.08.03.06.45.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 06:45:56 -0700 (PDT) From: Trond Myklebust To: Chuck Lever , linux-nfs@vger.kernel.org Subject: [PATCH v2 18/28] NFS: Fix up nfs_page_group_covers_page() Date: Thu, 3 Aug 2017 09:45:13 -0400 Message-Id: <20170803134523.4922-19-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170803134523.4922-18-trond.myklebust@primarydata.com> References: <20170803134523.4922-1-trond.myklebust@primarydata.com> <20170803134523.4922-2-trond.myklebust@primarydata.com> <20170803134523.4922-3-trond.myklebust@primarydata.com> <20170803134523.4922-4-trond.myklebust@primarydata.com> <20170803134523.4922-5-trond.myklebust@primarydata.com> <20170803134523.4922-6-trond.myklebust@primarydata.com> <20170803134523.4922-7-trond.myklebust@primarydata.com> <20170803134523.4922-8-trond.myklebust@primarydata.com> <20170803134523.4922-9-trond.myklebust@primarydata.com> <20170803134523.4922-10-trond.myklebust@primarydata.com> <20170803134523.4922-11-trond.myklebust@primarydata.com> <20170803134523.4922-12-trond.myklebust@primarydata.com> <20170803134523.4922-13-trond.myklebust@primarydata.com> <20170803134523.4922-14-trond.myklebust@primarydata.com> <20170803134523.4922-15-trond.myklebust@primarydata.com> <20170803134523.4922-16-trond.myklebust@primarydata.com> <20170803134523.4922-17-trond.myklebust@primarydata.com> <20170803134523.4922-18-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 Fix up the test in nfs_page_group_covers_page(). The simplest implementation is to check that we have a set of intersecting or contiguous subrequests that connect page offset 0 to nfs_page_length(req->wb_page). Signed-off-by: Trond Myklebust --- fs/nfs/write.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 0f418d825185..759e37d26acf 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -243,9 +243,6 @@ nfs_page_group_search_locked(struct nfs_page *head, unsigned int page_offset) { struct nfs_page *req; - WARN_ON_ONCE(head != head->wb_head); - WARN_ON_ONCE(!test_bit(PG_HEADLOCK, &head->wb_head->wb_flags)); - req = head; do { if (page_offset >= req->wb_pgbase && @@ -273,18 +270,15 @@ static bool nfs_page_group_covers_page(struct nfs_page *req) nfs_page_group_lock(req); - do { + for (;;) { tmp = nfs_page_group_search_locked(req->wb_head, pos); - if (tmp) { - /* no way this should happen */ - WARN_ON_ONCE(tmp->wb_pgbase != pos); - pos += tmp->wb_bytes - (pos - tmp->wb_pgbase); - } - } while (tmp && pos < len); + if (!tmp) + break; + pos = tmp->wb_pgbase + tmp->wb_bytes; + } nfs_page_group_unlock(req); - WARN_ON_ONCE(pos > len); - return pos == len; + return pos >= len; } /* We can set the PG_uptodate flag if we see that a write request