diff options
| author | David Sterba <dsterba@suse.com> | 2021-07-27 14:53:55 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-05-16 17:17:31 +0200 |
| commit | 0ff400135b2a11b4a565f4d631f7f4ea55a25a99 (patch) | |
| tree | 52a6a0d6fbb4712052acabb09783d869e93e6f5e | |
| parent | 7f6ca7f21de235ad79173445fc4d58a4afff41f6 (diff) | |
| download | linux-0ff400135b2a11b4a565f4d631f7f4ea55a25a99.tar.bz2 | |
btrfs: rename io_failure_record::bio_flags to compress_type
The bio_flags is now used to store unchanged compress type, so unify
that.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/extent_io.c | 6 | ||||
| -rw-r--r-- | fs/btrfs/extent_io.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 6c40eed217d6..faa41ca23bbb 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2538,7 +2538,7 @@ static struct io_failure_record *btrfs_get_io_failure_record(struct inode *inode failrec->start = start; failrec->len = sectorsize; failrec->this_mirror = 0; - failrec->bio_flags = 0; + failrec->compress_type = BTRFS_COMPRESS_NONE; read_lock(&em_tree->lock); em = lookup_extent_mapping(em_tree, start, failrec->len); @@ -2562,7 +2562,7 @@ static struct io_failure_record *btrfs_get_io_failure_record(struct inode *inode logical = em->block_start + logical; if (test_bit(EXTENT_FLAG_COMPRESSED, &em->flags)) { logical = em->block_start; - failrec->bio_flags = em->compress_type; + failrec->compress_type = em->compress_type; } btrfs_debug(fs_info, @@ -2694,7 +2694,7 @@ int btrfs_repair_one_sector(struct inode *inode, * will be handled by the endio on the repair_bio, so we can't return an * error here. */ - submit_bio_hook(inode, repair_bio, failrec->this_mirror, failrec->bio_flags); + submit_bio_hook(inode, repair_bio, failrec->this_mirror, failrec->compress_type); return BLK_STS_OK; } diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index fdbfe801dbe2..7774a48053fd 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -7,6 +7,7 @@ #include <linux/refcount.h> #include <linux/fiemap.h> #include <linux/btrfs_tree.h> +#include "compression.h" #include "ulist.h" enum { @@ -266,7 +267,7 @@ struct io_failure_record { u64 start; u64 len; u64 logical; - unsigned long bio_flags; + enum btrfs_compression_type compress_type; int this_mirror; int failed_mirror; }; |