Commit e12fa9cd authored by Jan Schmidt's avatar Jan Schmidt

btrfs scrub: use int for mirror_num, not u64

the rest of the code uses int mirror_num, and so should scrub
Signed-off-by: default avatarJan Schmidt <list.btrfs@jan-o-sch.net>
parent 8ddc7d9c
...@@ -65,7 +65,7 @@ static void scrub_fixup(struct scrub_bio *sbio, int ix); ...@@ -65,7 +65,7 @@ static void scrub_fixup(struct scrub_bio *sbio, int ix);
struct scrub_page { struct scrub_page {
u64 flags; /* extent flags */ u64 flags; /* extent flags */
u64 generation; u64 generation;
u64 mirror_num; int mirror_num;
int have_csum; int have_csum;
u8 csum[BTRFS_CSUM_SIZE]; u8 csum[BTRFS_CSUM_SIZE];
}; };
...@@ -776,7 +776,7 @@ static int scrub_submit(struct scrub_dev *sdev) ...@@ -776,7 +776,7 @@ static int scrub_submit(struct scrub_dev *sdev)
} }
static int scrub_page(struct scrub_dev *sdev, u64 logical, u64 len, static int scrub_page(struct scrub_dev *sdev, u64 logical, u64 len,
u64 physical, u64 flags, u64 gen, u64 mirror_num, u64 physical, u64 flags, u64 gen, int mirror_num,
u8 *csum, int force) u8 *csum, int force)
{ {
struct scrub_bio *sbio; struct scrub_bio *sbio;
...@@ -873,7 +873,7 @@ static int scrub_find_csum(struct scrub_dev *sdev, u64 logical, u64 len, ...@@ -873,7 +873,7 @@ static int scrub_find_csum(struct scrub_dev *sdev, u64 logical, u64 len,
/* scrub extent tries to collect up to 64 kB for each bio */ /* scrub extent tries to collect up to 64 kB for each bio */
static int scrub_extent(struct scrub_dev *sdev, u64 logical, u64 len, static int scrub_extent(struct scrub_dev *sdev, u64 logical, u64 len,
u64 physical, u64 flags, u64 gen, u64 mirror_num) u64 physical, u64 flags, u64 gen, int mirror_num)
{ {
int ret; int ret;
u8 csum[BTRFS_CSUM_SIZE]; u8 csum[BTRFS_CSUM_SIZE];
...@@ -919,7 +919,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_dev *sdev, ...@@ -919,7 +919,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_dev *sdev,
u64 physical; u64 physical;
u64 logical; u64 logical;
u64 generation; u64 generation;
u64 mirror_num; int mirror_num;
u64 increment = map->stripe_len; u64 increment = map->stripe_len;
u64 offset; u64 offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment