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=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 7F761C433DB for ; Tue, 30 Mar 2021 17:16:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 21A34619CD for ; Tue, 30 Mar 2021 17:16:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21A34619CD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 90DE16B007D; Tue, 30 Mar 2021 13:16:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E5576B0080; Tue, 30 Mar 2021 13:16:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D61D6B0082; Tue, 30 Mar 2021 13:16:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0008.hostedemail.com [216.40.44.8]) by kanga.kvack.org (Postfix) with ESMTP id 61EAD6B007D for ; Tue, 30 Mar 2021 13:16:36 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 25CE86D7B for ; Tue, 30 Mar 2021 17:16:36 +0000 (UTC) X-FDA: 77977194792.02.D85280B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id 4314A3DB for ; Tue, 30 Mar 2021 17:15:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=LJtqlA/kBtvsZ15zWdvm9iToMqA/4o6fu3tBvHGlUbE=; b=uN/gUIM3FbrA6Yt5NM7B2fbtIe 8UfbsYnN9nI87Nr6eFY6tQ0CChy1RgEX6bl0bWqNYXlv0DwivCeECg51AnZkBSMK5pUmgoz4Z2HaR sdJJV8wtsC3NB1xedzwLwCd2E4uWna1a9gIk5YXPL6NZ60NuiVjI8lX6ngwtFivQM3j9qyUYvC2h1 fxY2yX5KStgOt9vCM2OO2qNn8pKyl0y5OdV1cR5ztUhuMvsreODAB2L+ywz/Xp3wmyGsLt8aUIWzD XJPKlzcyt1ICa5zarD+uo3ei1mgwIwQYOxw9+vLKYjXSMc5kUgdGxvjIy6F+duvPmPQt2P4tJQcbp Z3TuXxAA==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lRHx6-003Ljx-6f; Tue, 30 Mar 2021 17:15:00 +0000 Date: Tue, 30 Mar 2021 18:14:52 +0100 From: Matthew Wilcox To: Mike Rapoport Cc: Andrew Morton , linux-mm@kvack.org, Huang Ying , Mike Rapoport , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] mm: Move page_mapping_file to pagemap.h Message-ID: <20210330171452.GO351017@casper.infradead.org> References: <20210317123011.350118-1-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 4314A3DB X-Stat-Signature: t5qr41zk9s685ernqtk918uotnkmbsfw Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617124527-291876 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: On Tue, Mar 30, 2021 at 08:11:19PM +0300, Mike Rapoport wrote: > On Wed, Mar 17, 2021 at 12:30:11PM +0000, Matthew Wilcox (Oracle) wrote: > > page_mapping_file() is only used by some architectures, and then it > > is usually only used in one place. Make it a static inline function > > so other architectures don't have to carry this dead code. > > As the original commit that replaced page_mapping() with > page_mapping_file() [cb9f753a3731 ("mm: fix races between swapoff and flush > dcache")] missed arch/nds32 I think it'll make sense to add the below hunk > to this patch: > > diff --git a/arch/nds32/mm/cacheflush.c b/arch/nds32/mm/cacheflush.c > index 6eb98a7ad27d..ad5344ef5d33 100644 > --- a/arch/nds32/mm/cacheflush.c > +++ b/arch/nds32/mm/cacheflush.c > @@ -238,7 +238,7 @@ void flush_dcache_page(struct page *page) > { > struct address_space *mapping; > > - mapping = page_mapping(page); > + mapping = page_mapping_file(page); > if (mapping && !mapping_mapped(mapping)) > set_bit(PG_dcache_dirty, &page->flags); > else { Good catch, but it's its own distinct problem, so I'd make it a separate patch.