From: Jan Kara <jack@suse.cz>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Mike Snitzer <snitzer@redhat.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Richard Weinberger <richard@nod.at>,
Josef Bacik <josef@toxicpanda.com>, Coly Li <colyli@suse.de>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
dm-devel@redhat.com, linux-mtd@lists.infradead.org,
Jan Kara <jack@suse.com>, Tejun Heo <tj@kernel.org>,
xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org,
linux-mm@kvack.org
Subject: Re: [dm-devel] [PATCH 17/20] filemap: consistently use ->f_mapping over ->i_mapping
Date: Thu, 19 Nov 2020 15:53:03 +0100 [thread overview]
Message-ID: <20201119145303.GZ1981@quack2.suse.cz> (raw)
In-Reply-To: <20201118084800.2339180-18-hch@lst.de>
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 <hch@lst.de>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
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 <jack@suse.com>
SUSE Labs, CR
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2020-11-19 14:53 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 8:47 [dm-devel] merge struct block_device and struct hd_struct Christoph Hellwig
2020-11-18 8:47 ` [dm-devel] [PATCH 01/20] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats Christoph Hellwig
2020-11-18 14:09 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-24 12:26 ` Tejun Heo
2020-11-18 8:47 ` [dm-devel] [PATCH 02/20] block: remove a duplicate __disk_get_part prototype Christoph Hellwig
2020-11-18 14:10 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [dm-devel] [PATCH 03/20] block: add a bdev_kobj helper Christoph Hellwig
2020-11-18 14:18 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [dm-devel] [PATCH 04/20] block: use disk_part_iter_exit in disk_part_iter_next Christoph Hellwig
2020-11-18 14:19 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [dm-devel] [PATCH 05/20] block: use put_device in put_disk Christoph Hellwig
2020-11-18 14:20 ` Jan Kara
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` [dm-devel] [PATCH 06/20] block: change the hash used for looking up block devices Christoph Hellwig
2020-11-18 14:22 ` Jan Kara
2020-11-18 8:47 ` [dm-devel] [PATCH 07/20] init: refactor name_to_dev_t Christoph Hellwig
2020-11-18 14:37 ` Jan Kara
2020-11-19 7:52 ` Christoph Hellwig
2020-11-19 8:25 ` Jan Kara
2020-11-20 8:49 ` Christoph Hellwig
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` [dm-devel] [PATCH 08/20] init: refactor devt_from_partuuid Christoph Hellwig
2020-11-18 14:41 ` Jan Kara
2020-11-18 8:47 ` [dm-devel] [PATCH 09/20] init: cleanup match_dev_by_uuid and match_dev_by_label Christoph Hellwig
2020-11-18 14:42 ` Jan Kara
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` [dm-devel] [PATCH 10/20] block: refactor __blkdev_put Christoph Hellwig
2020-11-18 14:46 ` Jan Kara
2020-11-18 8:47 ` [dm-devel] [PATCH 11/20] block: reference struct block_device from struct hd_struct Christoph Hellwig
2020-11-19 9:41 ` Jan Kara
2020-11-20 8:56 ` Christoph Hellwig
2020-11-24 16:59 ` Tejun Heo
2020-11-25 11:40 ` Jan Kara
2020-11-25 12:09 ` Tejun Heo
2020-11-18 8:47 ` [dm-devel] [PATCH 12/20] block: simplify the block device claiming interface Christoph Hellwig
2020-11-19 10:07 ` Jan Kara
2020-11-18 8:47 ` [dm-devel] [PATCH 13/20] block: remove ->bd_contains Christoph Hellwig
2020-11-19 10:32 ` Jan Kara
2020-11-20 9:01 ` Christoph Hellwig
2020-11-18 8:47 ` [dm-devel] [PATCH 14/20] block: remove the nr_sects field in struct hd_struct Christoph Hellwig
2020-11-19 12:05 ` Jan Kara
2020-11-20 9:08 ` Christoph Hellwig
2020-11-20 11:21 ` Jan Kara
2020-11-20 15:32 ` Christoph Hellwig
2020-11-20 15:59 ` Matthew Wilcox
2020-11-20 16:01 ` Christoph Hellwig
2020-11-20 20:05 ` Jan Kara
2020-11-21 16:24 ` Christoph Hellwig
2020-11-18 8:47 ` [dm-devel] [PATCH 15/20] block: merge struct block_device and " Christoph Hellwig
2020-11-19 14:39 ` Jan Kara
2020-11-20 9:15 ` Christoph Hellwig
2020-11-20 10:53 ` Jan Kara
2020-11-18 8:47 ` [dm-devel] [PATCH 16/20] block: stop using bdget_disk for partition 0 Christoph Hellwig
2020-11-19 14:43 ` Jan Kara
2020-11-18 8:47 ` [dm-devel] [PATCH 17/20] filemap: consistently use ->f_mapping over ->i_mapping Christoph Hellwig
2020-11-19 14:53 ` Jan Kara [this message]
2020-11-19 15:13 ` Matthew Wilcox
2020-11-20 9:17 ` Christoph Hellwig
2020-11-18 8:47 ` [dm-devel] [PATCH 18/20] fs: remove get_super_thawed and get_super_exclusive_thawed Christoph Hellwig
2020-11-19 14:59 ` Jan Kara
2020-11-18 8:47 ` [dm-devel] [PATCH 19/20] bcache: remove a superflous lookup_bdev all Christoph Hellwig
2020-11-18 8:54 ` Coly Li
2020-11-18 9:10 ` Greg KH
2020-11-18 9:55 ` Coly Li
2020-11-18 16:24 ` Christoph Hellwig
2020-11-18 8:48 ` [dm-devel] [PATCH 20/20] block: remove i_bdev Christoph Hellwig
2020-11-18 8:56 ` [dm-devel] merge struct block_device and struct hd_struct Jan Beulich
2020-11-18 8:58 ` Christoph Hellwig
2020-11-18 9:04 ` Jan Beulich
2020-11-18 9:08 ` Christoph Hellwig
2020-11-18 9:09 ` Greg KH
2020-11-18 9:23 ` Jan Beulich
2020-11-18 9:32 ` Greg KH
2020-11-18 12:50 ` Matthew Wilcox
2020-11-18 9:13 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201119145303.GZ1981@quack2.suse.cz \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=hch@lst.de \
--cc=jack@suse.com \
--cc=josef@toxicpanda.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
--cc=snitzer@redhat.com \
--cc=tj@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).