From patchwork Thu Aug 3 13:45:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9879137 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 7FC4860360 for ; Thu, 3 Aug 2017 13:45:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74D2F28830 for ; Thu, 3 Aug 2017 13:45:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69AF2288EF; Thu, 3 Aug 2017 13:45:53 +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 0F1B228830 for ; Thu, 3 Aug 2017 13:45:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751700AbdHCNpt (ORCPT ); Thu, 3 Aug 2017 09:45:49 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:33200 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbdHCNps (ORCPT ); Thu, 3 Aug 2017 09:45:48 -0400 Received: by mail-io0-f195.google.com with SMTP id q64so1310690ioi.0 for ; Thu, 03 Aug 2017 06:45:48 -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=PwPM5h+Ldclv4F9T+cohgt3mVOb96Hti5xjWnxh05YrAp1v+qyn1dThoFJkSWB8mHo duPjuBWg3VrYzrp3K+9Z1TnM7qeX8ixyGSBrgzedPdKpR2P0iwyJrYyad1vjPx9iIpy1 IZEQp5EMyO+c9wujOH11EyfSIhat+SOJ/QXoN1zeAGY+K6xHBCUtBdADbicQStNvRzBP nMmLNhUXdhQyTWDu/hg3kbB0ObnTxUoICTIM3dplnJmYt4RZi7CDKI+MU44z6WPArkCP l/lWl8F+A32GmGZkhakkBjrLWnDE/zcjov5c2wEadXosLH3frI3IOJKntjJrQJj18qGD 3mHw== 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=Hw6eySy9p0smh1kiaj35WKrPuR4i9qiKGX00HKPY3jF5dzFnlYr7RGo+ilaFVIvnYH 7AmejYPE1dRN98Q49xAMzZ7xi+UqsnNoUTiSl9dV0OPWewKWshMTym0gzDKj5uYh+wAm SMirWt+uiAlWZLYDagzL7LG5umojg5T+fSK+c6j7rGaHj+go+4WIuKTdNZ1sntYbQFEi CrpjxRIYB3g0DC/qNqzlIsC5DAcEVD1NG3VUlIXzJ3yL/4zBpARza8Qrcp973Jp2XccM +Yo1XipnIfCUbJtXoB1aaY1KT9vlmyClkpm6MEGmWSEI156wpt7tUssvxmkYjDoOdHpA ssKw== X-Gm-Message-State: AHYfb5h1ORZp5gVqVRMJPCCLwJxzy+cwQPgfq5GNJUsGMkefKc7vokE7 DIQv5OO6GwlNbA== X-Received: by 10.107.46.38 with SMTP id i38mr1767632ioo.116.1501767948106; Thu, 03 Aug 2017 06:45:48 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 06:45:47 -0700 (PDT) From: Trond Myklebust To: Chuck Lever , linux-nfs@vger.kernel.org Subject: [PATCH v2 11/28] NFS: Remove page group limit in nfs_flush_incompatible() Date: Thu, 3 Aug 2017 09:45:06 -0400 Message-Id: <20170803134523.4922-12-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170803134523.4922-11-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> 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))) {