From patchwork Wed Jul 19 22:09:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9853277 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 2595A602BD for ; Wed, 19 Jul 2017 22:10:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17885285EA for ; Wed, 19 Jul 2017 22:10:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C61828717; Wed, 19 Jul 2017 22:10:18 +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 C104F285EA for ; Wed, 19 Jul 2017 22:10:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754557AbdGSWKP (ORCPT ); Wed, 19 Jul 2017 18:10:15 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:36421 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755520AbdGSWKN (ORCPT ); Wed, 19 Jul 2017 18:10:13 -0400 Received: by mail-it0-f68.google.com with SMTP id r9so27547ita.3 for ; Wed, 19 Jul 2017 15:10:13 -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=nTy8gH5SBWe7HeVs97JQ6FMR0ko4d69iskK21Yo1npg=; b=nm20LZQ85h+T7tzOyYzOH4CrzC8y+v2onlSOSRZQ+OJB8jqDXso5/mjmjaGbZIKr9e 9NMfFT+c7RRWlvTQN6Z02T/c4JclQGu7tty0qoUzhLVZj7sh1kPOaSznKlNuXYGp3L4U Gw8bTZX/55/L6w/iVGkTkhez19EItCwOtNUDvnc3XQuEzzO9ugngeC+57F8G+dkYETxT BneIVeqoYjOd7mznH0r4/RUxcpoQZplC4pfoTDuRphr8rxLdNS8TJffTc8mA3ZqyddNM oo+iwn2oIVOnIsFwgkumpd7S4Z5Adjzln4j3M+YM9tQl+cJmd2cMOPJkz1z4DGVtqlgP DcZw== 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=nTy8gH5SBWe7HeVs97JQ6FMR0ko4d69iskK21Yo1npg=; b=K/xtrscfEX4YJ+MxaWi8ZpyChGGN6fFymAcI6+HgM3VIF54P8YjofIGSPoW6C0JUSL xhMIASTPboI8j9Y6sZXQ0ePA/BDo/lfvfgJD6y75OzzctD45zo9ZVXJCcvAO+wavxzWV vJukSPbkYpuQHGW9MqGPABHAtbiUxSVISIy4UxmSPTz9vlw0kKpYTJXXx3QJJHGWcQNe 5ERSwLmK/6rdP4RtoR4/NdzujbLxUx9dcBaklSQmWdGaQ05opMg9Z9qNtbcoBsyTBBjv 0gDLRL18ba91hkUSsHhc8tI7V4EQ6iAzWOnycODrQj0OKwgvIX30N4lr1Li+85oqZjk0 piRw== X-Gm-Message-State: AIVw113Bykg+NxBYBbU9u1kzlGoJ5mwzmGonhELjHo+w1xkNSe/hDkFd kH8HozlslX1FMA== X-Received: by 10.36.66.195 with SMTP id i186mr1381541itb.144.1500502213412; Wed, 19 Jul 2017 15:10:13 -0700 (PDT) Received: from leira.trondhjem.org (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id 9sm518333iop.9.2017.07.19.15.10.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Jul 2017 15:10:12 -0700 (PDT) From: Trond Myklebust To: Chuck Lever , linux-nfs@vger.kernel.org Subject: [PATCH 11/20] NFS: Remove page group limit in nfs_flush_incompatible() Date: Wed, 19 Jul 2017 18:09:46 -0400 Message-Id: <20170719220955.58210-12-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170719220955.58210-11-trond.myklebust@primarydata.com> References: <20170719220955.58210-1-trond.myklebust@primarydata.com> <20170719220955.58210-2-trond.myklebust@primarydata.com> <20170719220955.58210-3-trond.myklebust@primarydata.com> <20170719220955.58210-4-trond.myklebust@primarydata.com> <20170719220955.58210-5-trond.myklebust@primarydata.com> <20170719220955.58210-6-trond.myklebust@primarydata.com> <20170719220955.58210-7-trond.myklebust@primarydata.com> <20170719220955.58210-8-trond.myklebust@primarydata.com> <20170719220955.58210-9-trond.myklebust@primarydata.com> <20170719220955.58210-10-trond.myklebust@primarydata.com> <20170719220955.58210-11-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 nfs_try_to_update_request() should be able to cope now. Signed-off-by: Trond Myklebust --- fs/nfs/write.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 0b4d1ef168e0..08c1ce968cce 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1205,8 +1205,6 @@ int nfs_flush_incompatible(struct file *file, struct page *page) l_ctx = req->wb_lock_context; do_flush = req->wb_page != page || !nfs_match_open_context(req->wb_context, ctx); - /* for now, flush if more than 1 request in page_group */ - do_flush |= req->wb_this_page != req; if (l_ctx && flctx && !(list_empty_careful(&flctx->flc_posix) && list_empty_careful(&flctx->flc_flock))) {