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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 06820C63697 for ; Thu, 19 Nov 2020 14:53:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5F446206D5 for ; Thu, 19 Nov 2020 14:53:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F446206D5 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 B97E16B006E; Thu, 19 Nov 2020 09:53:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B21F96B0085; Thu, 19 Nov 2020 09:53:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E8F66B0087; Thu, 19 Nov 2020 09:53:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0051.hostedemail.com [216.40.44.51]) by kanga.kvack.org (Postfix) with ESMTP id 6942C6B006E for ; Thu, 19 Nov 2020 09:53:06 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 0DCEB8249980 for ; Thu, 19 Nov 2020 14:53:06 +0000 (UTC) X-FDA: 77501460372.03.books51_1b0d78227343 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id D191F28A4EB for ; Thu, 19 Nov 2020 14:53:05 +0000 (UTC) X-HE-Tag: books51_1b0d78227343 X-Filterd-Recvd-Size: 3583 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Thu, 19 Nov 2020 14:53:05 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0A44DAC2F; Thu, 19 Nov 2020 14:53:04 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id BD7681E130B; Thu, 19 Nov 2020 15:53:03 +0100 (CET) Date: Thu, 19 Nov 2020 15:53:03 +0100 From: Jan Kara To: Christoph Hellwig Cc: 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: <20201119145303.GZ1981@quack2.suse.cz> References: <20201118084800.2339180-1-hch@lst.de> <20201118084800.2339180-18-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201118084800.2339180-18-hch@lst.de> User-Agent: Mutt/1.10.1 (2018-07-13) 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 Wed 18-11-20 09:47:57, Christoph Hellwig wrote: > Use file->f_mapping in all remaining places that have a struct file > available to properly handle the case where inode->i_mapping != > file_inode(file)->i_mapping. > > Signed-off-by: Christoph Hellwig Looks good. You can add: Reviewed-by: Jan Kara Honza > --- > mm/filemap.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/mm/filemap.c b/mm/filemap.c > index d5e7c2029d16b4..3e3531a757f8db 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -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) { > unlock_page(page); > ret = VM_FAULT_NOPAGE; > goto out; > @@ -3149,10 +3149,9 @@ void dio_warn_stale_pagecache(struct file *filp) > { > static DEFINE_RATELIMIT_STATE(_rs, 86400 * HZ, DEFAULT_RATELIMIT_BURST); > char pathname[128]; > - struct inode *inode = file_inode(filp); > char *path; > > - errseq_set(&inode->i_mapping->wb_err, -EIO); > + errseq_set(&filp->f_mapping->wb_err, -EIO); > if (__ratelimit(&_rs)) { > path = file_path(filp, pathname, sizeof(pathname)); > if (IS_ERR(path)) > @@ -3179,7 +3178,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from) > > if (iocb->ki_flags & IOCB_NOWAIT) { > /* If there are pages to writeback, return */ > - if (filemap_range_has_page(inode->i_mapping, pos, > + if (filemap_range_has_page(file->f_mapping, pos, > pos + write_len - 1)) > return -EAGAIN; > } else { > -- > 2.29.2 > -- Jan Kara SUSE Labs, CR