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=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 40222C5519F for ; Fri, 20 Nov 2020 09:17:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AF9502224C for ; Fri, 20 Nov 2020 09:17:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF9502224C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 34FD36B006C; Fri, 20 Nov 2020 04:17:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 300DA6B0070; Fri, 20 Nov 2020 04:17:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 215886B0072; Fri, 20 Nov 2020 04:17:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0063.hostedemail.com [216.40.44.63]) by kanga.kvack.org (Postfix) with ESMTP id DDD506B006C for ; Fri, 20 Nov 2020 04:17:17 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7B1E98249980 for ; Fri, 20 Nov 2020 09:17:17 +0000 (UTC) X-FDA: 77504242914.08.arm90_0610e2f2734a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id 5D0381819E76F for ; Fri, 20 Nov 2020 09:17:17 +0000 (UTC) X-HE-Tag: arm90_0610e2f2734a X-Filterd-Recvd-Size: 2316 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Nov 2020 09:17:16 +0000 (UTC) Received: by verein.lst.de (Postfix, from userid 2407) id E4E0067373; Fri, 20 Nov 2020 10:17:14 +0100 (CET) Date: Fri, 20 Nov 2020 10:17:14 +0100 From: Christoph Hellwig To: Matthew Wilcox Cc: Christoph Hellwig , Jens Axboe , Tejun Heo , Josef Bacik , Konrad Rzeszutek Wilk , Coly Li , Mike Snitzer , dm-devel@redhat.com, Richard Weinberger , Jan Kara , linux-block@vger.kernel.org, xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 17/20] filemap: consistently use ->f_mapping over ->i_mapping Message-ID: <20201120091714.GF21715@lst.de> References: <20201118084800.2339180-1-hch@lst.de> <20201118084800.2339180-18-hch@lst.de> <20201119151316.GH29991@casper.infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201119151316.GH29991@casper.infradead.org> User-Agent: Mutt/1.5.17 (2007-11-01) 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 Thu, Nov 19, 2020 at 03:13:16PM +0000, Matthew Wilcox wrote: > On Wed, Nov 18, 2020 at 09:47:57AM +0100, Christoph Hellwig wrote: > > @@ -2887,13 +2887,13 @@ EXPORT_SYMBOL(filemap_map_pages); > > vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) > > { > > struct page *page = vmf->page; > > - struct inode *inode = file_inode(vmf->vma->vm_file); > > + struct inode *inode = vmf->vma->vm_file->f_mapping->host; > > vm_fault_t ret = VM_FAULT_LOCKED; > > > > sb_start_pagefault(inode->i_sb); > > file_update_time(vmf->vma->vm_file); > > lock_page(page); > > - if (page->mapping != inode->i_mapping) { > > + if (page->mapping != vmf->vma->vm_file->f_mapping) { > > Bit messy. I'd do: > > struct address_space *mapping = vmf->vma->vm_file->f_mapping; > > sb_start_pagefault(mapping->host->i_sb); > > if (page->mapping != mapping) > > sb_end_pagefault(mapping->host->i_sb); Fine with me.