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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 080F9C5519F for ; Wed, 18 Nov 2020 09:12:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 785172467A for ; Wed, 18 Nov 2020 09:12:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="U+CT7FI/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 785172467A 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 0D56E6B0099; Wed, 18 Nov 2020 04:12:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 084E76B009A; Wed, 18 Nov 2020 04:12:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E67406B009B; Wed, 18 Nov 2020 04:12:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0124.hostedemail.com [216.40.44.124]) by kanga.kvack.org (Postfix) with ESMTP id B78936B0099 for ; Wed, 18 Nov 2020 04:12:19 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 691128249980 for ; Wed, 18 Nov 2020 09:12:19 +0000 (UTC) X-FDA: 77496972798.02.dolls45_58089fd27339 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 53D5910097AA0 for ; Wed, 18 Nov 2020 09:12:19 +0000 (UTC) X-HE-Tag: dolls45_58089fd27339 X-Filterd-Recvd-Size: 3901 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Nov 2020 09:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=p6UHeMdNPZtbtbIn43eVEAdBbhJQd+3671CGRMSmzGQ=; b=U+CT7FI/RNVqd8977Z9jys84zx D5PJs3XqwRZ2I4/5WIasYm3mO3hz6MEPuPBxpOUse9ZssA6t9l0w+A0keOeXTtOgMFzizktjEA7Hr lGo6ggP8TPFpI263wFUgLY4Kzp3fTQiuP7Z/THc501YB4CW12JxTpfjg2mdQPzSqE7OPNd4rECdn/ 7jivfGwOCd8eWfwYg+Y4GPsB7EFyXW29c/OGQJjvi228S9KWwCz09Usiub7OnZfO2EQoeDImpFdcG Z56X0eWsNkNq8gS/VMw0EsIXHjgjw650qnJtFnoE2b3neXJfoAYmgACwhZLOofNjqd+5jYI2I/PXp +43PTD3g==; Received: from [2001:4bb8:18c:31ba:32b1:ec66:5459:36a] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfJ8h-0007oc-Bb; Wed, 18 Nov 2020 08:48:32 +0000 From: Christoph Hellwig To: Jens Axboe Cc: 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: [PATCH 17/20] filemap: consistently use ->f_mapping over ->i_mapping Date: Wed, 18 Nov 2020 09:47:57 +0100 Message-Id: <20201118084800.2339180-18-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201118084800.2339180-1-hch@lst.de> References: <20201118084800.2339180-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html 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: Use file->f_mapping in all remaining places that have a struct file available to properly handle the case where inode->i_mapping !=3D file_inode(file)->i_mapping. Signed-off-by: Christoph Hellwig --- 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 =3D vmf->page; - struct inode *inode =3D file_inode(vmf->vma->vm_file); + struct inode *inode =3D vmf->vma->vm_file->f_mapping->host; vm_fault_t ret =3D VM_FAULT_LOCKED; =20 sb_start_pagefault(inode->i_sb); file_update_time(vmf->vma->vm_file); lock_page(page); - if (page->mapping !=3D inode->i_mapping) { + if (page->mapping !=3D vmf->vma->vm_file->f_mapping) { unlock_page(page); ret =3D 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 =3D file_inode(filp); char *path; =20 - errseq_set(&inode->i_mapping->wb_err, -EIO); + errseq_set(&filp->f_mapping->wb_err, -EIO); if (__ratelimit(&_rs)) { path =3D file_path(filp, pathname, sizeof(pathname)); if (IS_ERR(path)) @@ -3179,7 +3178,7 @@ generic_file_direct_write(struct kiocb *iocb, struc= t iov_iter *from) =20 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 { --=20 2.29.2