From: Gao Xiang <hsiangkao@linux.alibaba.com>
To: Yu Kuai <yukuai1@huaweicloud.com>,
axboe@kernel.dk, roger.pau@citrix.com, colyli@suse.de,
kent.overstreet@gmail.com, joern@lazybastard.org,
miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com,
sth@linux.ibm.com, hoeppner@linux.ibm.com, hca@linux.ibm.com,
gor@linux.ibm.com, agordeev@linux.ibm.com, jejb@linux.ibm.com,
martin.petersen@oracle.com, clm@fb.com, josef@toxicpanda.com,
dsterba@suse.com, viro@zeniv.linux.org.uk, brauner@kernel.org,
nico@fluxnic.net, xiang@kernel.org, chao@kernel.org,
tytso@mit.edu, adilger.kernel@dilger.ca, agruenba@redhat.com,
jack@suse.com, konishi.ryusuke@gmail.com, willy@infradead.org,
akpm@linux-foundation.org, p.raghav@samsung.com, hare@suse.de
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org,
linux-mtd@lists.infradead.org, linux-s390@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-bcachefs@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org,
gfs2@lists.linux.dev, linux-nilfs@vger.kernel.org,
yukuai3@huawei.com, yi.zhang@huawei.com, yangerkun@huawei.com
Subject: Re: [PATCH RFC v2 for-6.8/block 11/18] erofs: use bdev api
Date: Tue, 12 Dec 2023 14:35:51 +0800 [thread overview]
Message-ID: <1812c1bf-08b5-46a5-a633-12470e2c8f18@linux.alibaba.com> (raw)
In-Reply-To: <20231211140722.974745-1-yukuai1@huaweicloud.com>
On 2023/12/11 22:07, Yu Kuai wrote:
> From: Yu Kuai <yukuai3@huawei.com>
>
> Avoid to access bd_inode directly, prepare to remove bd_inode from
> block_devcie.
>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
> fs/erofs/data.c | 18 ++++++++++++------
> fs/erofs/internal.h | 2 ++
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/fs/erofs/data.c b/fs/erofs/data.c
> index c98aeda8abb2..8cf3618190ab 100644
> --- a/fs/erofs/data.c
> +++ b/fs/erofs/data.c
> @@ -32,8 +32,7 @@ void erofs_put_metabuf(struct erofs_buf *buf)
> void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,
> enum erofs_kmap_type type)
> {
> - struct inode *inode = buf->inode;
> - erofs_off_t offset = (erofs_off_t)blkaddr << inode->i_blkbits;
> + erofs_off_t offset = (erofs_off_t)blkaddr << buf->blkszbits;
I'd suggest that use `buf->blkszbits` only for bdev_read_folio() since
erofs_init_metabuf() is not always called before erofs_bread() is used.
For example, buf->inode can be one of directory inodes other than
initialized by erofs_init_metabuf().
Thanks,
Gao Xiang
> pgoff_t index = offset >> PAGE_SHIFT;
> struct page *page = buf->page;
> struct folio *folio;
> @@ -43,7 +42,9 @@ void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,
> erofs_put_metabuf(buf);
>
> nofs_flag = memalloc_nofs_save();
> - folio = read_cache_folio(inode->i_mapping, index, NULL, NULL);
> + folio = buf->inode ?
> + read_mapping_folio(buf->inode->i_mapping, index, NULL) :
> + bdev_read_folio(buf->bdev, offset);
> memalloc_nofs_restore(nofs_flag);
> if (IS_ERR(folio))
> return folio;
> @@ -67,10 +68,15 @@ void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,
>
> void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb)
> {
> - if (erofs_is_fscache_mode(sb))
> + if (erofs_is_fscache_mode(sb)) {
> buf->inode = EROFS_SB(sb)->s_fscache->inode;
> - else
> - buf->inode = sb->s_bdev->bd_inode;
> + buf->bdev = NULL;
> + buf->blkszbits = buf->inode->i_blkbits;
> + } else {
> + buf->inode = NULL;
> + buf->bdev = sb->s_bdev;
> + buf->blkszbits = EROFS_SB(sb)->blkszbits;
> + }
> }
>
> void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
> index b0409badb017..c9206351b485 100644
> --- a/fs/erofs/internal.h
> +++ b/fs/erofs/internal.h
> @@ -224,8 +224,10 @@ enum erofs_kmap_type {
>
> struct erofs_buf {
> struct inode *inode;
> + struct block_device *bdev;
> struct page *page;
> void *base;
> + u8 blkszbits;
> enum erofs_kmap_type kmap_type;
> };
> #define __EROFS_BUF_INITIALIZER ((struct erofs_buf){ .page = NULL })
next prev parent reply other threads:[~2023-12-12 6:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-11 14:05 [PATCH RFC v2 for-6.8/block 00/18] block: don't access bd_inode directly from other modules Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 01/18] block: add some bdev apis Yu Kuai
2023-12-11 16:52 ` Jan Kara
2023-12-12 1:25 ` Yu Kuai
2023-12-12 13:14 ` Christoph Hellwig
2023-12-13 1:10 ` Yu Kuai
2023-12-12 13:16 ` Christoph Hellwig
2023-12-13 1:09 ` Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 02/18] xen/blkback: use bdev api in xen_update_blkif_status() Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 03/18] bcache: use bdev api in read_super() Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 04/18] mtd: block2mtd: use bdev apis Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 05/18] s390/dasd: use bdev api in dasd_format() Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 06/18] scsicam: use bdev api in scsi_bios_ptable() Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 07/18] bcachefs: remove dead function bdev_sectors() Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 08/18] bio: export bio_add_folio_nofail() Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 09/18] btrfs: use bdev apis Yu Kuai
2023-12-11 14:05 ` [PATCH RFC v2 for-6.8/block 10/18] cramfs: use bdev apis in cramfs_blkdev_read() Yu Kuai
2023-12-11 14:07 ` [PATCH RFC v2 for-6.8/block 11/18] erofs: use bdev api Yu Kuai
2023-12-12 6:35 ` Gao Xiang [this message]
2023-12-12 6:49 ` Yu Kuai
2023-12-11 14:07 ` [PATCH RFC v2 for-6.8/block 12/18] gfs2: " Yu Kuai
2023-12-11 14:07 ` [PATCH RFC v2 for-6.8/block 13/18] nilfs2: use bdev api in nilfs_attach_log_writer() Yu Kuai
2023-12-11 14:07 ` [PATCH RFC v2 for-6.8/block 14/18] jbd2: use bdev apis Yu Kuai
2023-12-11 14:07 ` [PATCH RFC v2 for-6.8/block 15/18] buffer: add a new helper to read sb block Yu Kuai
2023-12-11 17:27 ` Jan Kara
2023-12-12 1:32 ` Yu Kuai
2023-12-12 13:25 ` Christoph Hellwig
2023-12-12 14:11 ` Jan Kara
2023-12-11 14:08 ` [PATCH RFC v2 for-6.8/block 16/18] ext4: use " Yu Kuai
2023-12-11 17:16 ` Jan Kara
2023-12-11 14:08 ` [PATCH RFC v2 for-6.8/block 17/18] ext4: remove block_device_ejected() Yu Kuai
2023-12-11 17:04 ` Jan Kara
2023-12-12 13:22 ` Christoph Hellwig
2023-12-11 14:08 ` [PATCH RFC v2 for-6.8/block 18/18] ext4: use bdev apis Yu Kuai
2023-12-11 17:02 ` Jan Kara
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=1812c1bf-08b5-46a5-a633-12470e2c8f18@linux.alibaba.com \
--to=hsiangkao@linux.alibaba.com \
--cc=adilger.kernel@dilger.ca \
--cc=agordeev@linux.ibm.com \
--cc=agruenba@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=clm@fb.com \
--cc=colyli@suse.de \
--cc=dsterba@suse.com \
--cc=gfs2@lists.linux.dev \
--cc=gor@linux.ibm.com \
--cc=hare@suse.de \
--cc=hca@linux.ibm.com \
--cc=hoeppner@linux.ibm.com \
--cc=jack@suse.com \
--cc=jejb@linux.ibm.com \
--cc=joern@lazybastard.org \
--cc=josef@toxicpanda.com \
--cc=kent.overstreet@gmail.com \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-bcachefs@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=miquel.raynal@bootlin.com \
--cc=nico@fluxnic.net \
--cc=p.raghav@samsung.com \
--cc=richard@nod.at \
--cc=roger.pau@citrix.com \
--cc=sth@linux.ibm.com \
--cc=tytso@mit.edu \
--cc=vigneshr@ti.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=xen-devel@lists.xenproject.org \
--cc=xiang@kernel.org \
--cc=yangerkun@huawei.com \
--cc=yi.zhang@huawei.com \
--cc=yukuai1@huaweicloud.com \
--cc=yukuai3@huawei.com \
/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).