[RFC PATCH 33/37] jfs: use bio_init_fields in metadata
From: Chaitanya Kulkarni <hidden>
Date: 2021-01-19 05:30:20
Also in:
dm-devel, linux-block, linux-btrfs, linux-ext4, linux-fsdevel, linux-raid, linux-scsi, linux-xfs, lkml, target-devel
Subsystem:
filesystems (vfs and infrastructure), jfs filesystem, the rest · Maintainers:
Alexander Viro, Christian Brauner, Dave Kleikamp, Linus Torvalds
Signed-off-by: Chaitanya Kulkarni <redacted> --- fs/jfs/jfs_metapage.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 176580f54af9..5cea9c137a48 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c@@ -417,10 +417,10 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc) len = min(xlen, (int)JFS_SBI(inode->i_sb)->nbperpage); bio = bio_alloc(GFP_NOFS, 1); - bio_set_dev(bio, inode->i_sb->s_bdev); - bio->bi_iter.bi_sector = pblock << (inode->i_blkbits - 9); - bio->bi_end_io = metapage_write_end_io; - bio->bi_private = page; + bio_init_fields(bio, inode->i_sb->s_bdev, + pblock << (inode->i_blkbits - 9), + page, metapage_write_end_io, 0, 0); + bio_set_op_attrs(bio, REQ_OP_WRITE, 0); /* Don't call bio_add_page yet, we may add to this vec */
@@ -497,11 +497,9 @@ static int metapage_readpage(struct file *fp, struct page *page) submit_bio(bio); bio = bio_alloc(GFP_NOFS, 1); - bio_set_dev(bio, inode->i_sb->s_bdev); - bio->bi_iter.bi_sector = - pblock << (inode->i_blkbits - 9); - bio->bi_end_io = metapage_read_end_io; - bio->bi_private = page; + bio_init_fields(bio, inode->i_sb->s_bdev, + pblock << (inode->i_blkbits - 9, + page, metapage_read_end_io, 0, 0); bio_set_op_attrs(bio, REQ_OP_READ, 0); len = xlen << inode->i_blkbits; offset = block_offset << inode->i_blkbits;
--
2.22.1