From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87CB4C34031 for ; Tue, 18 Feb 2020 21:26:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4A36C2173E for ; Tue, 18 Feb 2020 21:26:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A36C2173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EDC206B0005; Tue, 18 Feb 2020 16:26:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E652C6B0006; Tue, 18 Feb 2020 16:26:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D05EF6B0007; Tue, 18 Feb 2020 16:26:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0158.hostedemail.com [216.40.44.158]) by kanga.kvack.org (Postfix) with ESMTP id B30B76B0005 for ; Tue, 18 Feb 2020 16:26:45 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 749F7181AEF00 for ; Tue, 18 Feb 2020 21:26:45 +0000 (UTC) X-FDA: 76504532370.02.bite24_1dd5f6255e911 X-HE-Tag: bite24_1dd5f6255e911 X-Filterd-Recvd-Size: 4139 Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Tue, 18 Feb 2020 21:26:44 +0000 (UTC) Received: from mail-qk1-f198.google.com ([209.85.222.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j4AOB-0005MQ-6D for linux-mm@kvack.org; Tue, 18 Feb 2020 21:26:43 +0000 Received: by mail-qk1-f198.google.com with SMTP id s189so2432212qke.5 for ; Tue, 18 Feb 2020 13:26:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Sy0OONV+lwoKLJ/Vpr24RewxD28TW9ngrjf5cwwzJIE=; b=Cbme0bL2D2oWAY/L9K0Zsd4XLVHL53/F5or1ytlR9n9Dp+xcJpIhRsaSJJNoOhALRP vJjXm8izvxhiKcrD3jChA46vmuPF1bt+NaXYr3KxUI2eG267s8iKWC5lddd9P/NsRq94 Mm0QnuJ5Ey4pVTDMH66yvQku+G+Rs2GbndmuCxWTcA407nhEJ8QopHpHbGOlvZfGhA7D R99aD7h5RT8tBkXZ61k06/FsT220htF922qGrllsku3fzhpmyVw3SfTZY4MwTf2nEwF9 BchFi6EtmztCI/uvNjYYRR6XdzsGz/XbbRHXuGN/Ezccr31ok+/GC1liOUtWkRM/nN9A T+1g== X-Gm-Message-State: APjAAAXFxFF7QkMpBtK2GU8UfYgdM4sS+fXQB/Na6/W3dBi4PK/iDRYD 9n1gNrgXhfMb9WIIp9lm8BGEvLNeakuxwsWNxw9AZax9rRj7vH94hPdOZDyNay/n8BTZIlk0777 gdVPRFaj7gUyDIhfzCRmwo4Rbo0fA X-Received: by 2002:ac8:4505:: with SMTP id q5mr18708850qtn.84.1582061201914; Tue, 18 Feb 2020 13:26:41 -0800 (PST) X-Google-Smtp-Source: APXvYqw+TaT9y6P8ixH2MNfJhuKsalJDR9ST/x8ltT0emlDJcX9QXw6UvzlTIzwxglEbuc2fWwPikw== X-Received: by 2002:ac8:4505:: with SMTP id q5mr18708838qtn.84.1582061201661; Tue, 18 Feb 2020 13:26:41 -0800 (PST) Received: from localhost.localdomain ([2804:14c:4e7:1017:1c35:828a:99a9:563b]) by smtp.gmail.com with ESMTPSA id j127sm2162814qkc.36.2020.02.18.13.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2020 13:26:41 -0800 (PST) From: Mauricio Faria de Oliveira To: Andrew Morton , linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] mm/page-writeback.c: write_cache_pages(): deduplicate identical checks Date: Tue, 18 Feb 2020 18:26:37 -0300 Message-Id: <20200218212637.28101-1-mfo@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: There used to be a 'retry' label in between the two (identical) checks when first introduced in commit f446daaea9d4 ("mm: implement writeback livelock avoidance using page tagging"), and later modified/updated in commit 6e6938b6d313 ("writeback: introduce .tagged_writepages for the WB_SYNC_NONE sync stage"). The label has been removed in commit 64081362e8ff ("mm/page-writeback.c: fix range_cyclic writeback vs writepages deadlock"), and the (identical) checks are now present / performed immediately one after another. So, remove/deduplicate the latter check, moving tag_pages_for_writeback() into the former check before the 'tag' variable assignment, so it's clear that it's not used in this (similarly-named) function call but only later in pagevec_lookup_range_tag(). Signed-off-by: Mauricio Faria de Oliveira --- mm/page-writeback.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 2caf780a42e7..86c18112b89b 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2183,11 +2183,10 @@ int write_cache_pages(struct address_space *mappi= ng, range_whole =3D 1; } if (wbc->sync_mode =3D=3D WB_SYNC_ALL || wbc->tagged_writepages) + tag_pages_for_writeback(mapping, index, end); tag =3D PAGECACHE_TAG_TOWRITE; else tag =3D PAGECACHE_TAG_DIRTY; - if (wbc->sync_mode =3D=3D WB_SYNC_ALL || wbc->tagged_writepages) - tag_pages_for_writeback(mapping, index, end); done_index =3D index; while (!done && (index <=3D end)) { int i; --=20 2.20.1