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=unavailable 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 003CDC3524B for ; Tue, 4 Feb 2020 14:25:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AF15A20730 for ; Tue, 4 Feb 2020 14:25:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF15A20730 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F34856B0003; Tue, 4 Feb 2020 09:25:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EBDBF6B0005; Tue, 4 Feb 2020 09:25:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DAC306B0006; Tue, 4 Feb 2020 09:25:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0070.hostedemail.com [216.40.44.70]) by kanga.kvack.org (Postfix) with ESMTP id C0AAE6B0003 for ; Tue, 4 Feb 2020 09:25:19 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6EF7933CD for ; Tue, 4 Feb 2020 14:25:19 +0000 (UTC) X-FDA: 76452667158.22.base92_2e6d22bccd526 X-HE-Tag: base92_2e6d22bccd526 X-Filterd-Recvd-Size: 1656 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Tue, 4 Feb 2020 14:25:18 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 94BA5AE52; Tue, 4 Feb 2020 14:25:17 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id F0B9D1E0D09; Tue, 4 Feb 2020 15:25:15 +0100 (CET) From: Jan Kara To: Matthew Wilcox Cc: , , Jan Kara Subject: [PATCH 4/8] mm: Use xas_erase() in page_cache_delete_batch() Date: Tue, 4 Feb 2020 15:25:10 +0100 Message-Id: <20200204142514.15826-5-jack@suse.cz> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200204142514.15826-1-jack@suse.cz> References: <20200204142514.15826-1-jack@suse.cz> 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: We need to clear marks when removing a page from xarray since there could be DIRTY or TOWRITE tags left for the page. Use xas_erase() to explicitely request mark clearing. Signed-off-by: Jan Kara --- mm/filemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index bf6aa30be58d..ca7eeb067a23 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -333,7 +333,7 @@ static void page_cache_delete_batch(struct address_space *mapping, */ if (page->index + compound_nr(page) - 1 == xas.xa_index) i++; - xas_store(&xas, NULL); + xas_erase(&xas); total_pages++; } mapping->nrpages -= total_pages; -- 2.16.4