From 295fe46ff19b990c19b84b0d39a88d7e73710b19 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 21 Jan 2023 07:50:14 +0100 Subject: [PATCH] btrfs: remove struct btrfs_bio::is_metadata flag This flag is unused now, so remove it. Re-expand the mirror_num field to 8 bits, and move it to the I/O completion internal section of the structure. Reviewed-by: Johannes Thumshirn Signed-off-by: Christoph Hellwig Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/btrfs/bio.h | 11 +---------- fs/btrfs/disk-io.c | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/fs/btrfs/bio.h b/fs/btrfs/bio.h index c232148348df..a96bcb3f36f6 100644 --- a/fs/btrfs/bio.h +++ b/fs/btrfs/bio.h @@ -30,16 +30,6 @@ typedef void (*btrfs_bio_end_io_t)(struct btrfs_bio *bbio); * passed to btrfs_submit_bio for mapping to the physical devices. */ struct btrfs_bio { - unsigned int mirror_num:7; - - /* - * Extra indicator for metadata bios. - * For some btrfs bios they use pages without a mapping, thus - * we can not rely on page->mapping->host to determine if - * it's a metadata bio. - */ - unsigned int is_metadata:1; - /* Inode and offset into it that this I/O operates on. */ struct btrfs_inode *inode; u64 file_offset; @@ -64,6 +54,7 @@ struct btrfs_bio { void *private; /* For internal use in read end I/O handling */ + unsigned int mirror_num; struct work_struct end_io_work; /* diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index dc5bf46529f0..cb8e495f981b 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -846,7 +846,6 @@ void btrfs_submit_metadata_bio(struct btrfs_inode *inode, struct bio *bio, int m blk_status_t ret; bio->bi_opf |= REQ_META; - bbio->is_metadata = 1; if (btrfs_op(bio) != BTRFS_MAP_WRITE) { btrfs_submit_bio(fs_info, bio, mirror_num);