Skip to content

Commit

Permalink
btrfs scrub: use int for mirror_num, not u64
Browse files Browse the repository at this point in the history
the rest of the code uses int mirror_num, and so should scrub

Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
  • Loading branch information
Jan Schmidt committed Sep 29, 2011
1 parent 8ddc7d9 commit e12fa9c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/btrfs/scrub.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static void scrub_fixup(struct scrub_bio *sbio, int ix);
struct scrub_page {
u64 flags; /* extent flags */
u64 generation;
u64 mirror_num;
int mirror_num;
int have_csum;
u8 csum[BTRFS_CSUM_SIZE];
};
Expand Down Expand Up @@ -776,7 +776,7 @@ static int scrub_submit(struct scrub_dev *sdev)
}

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)
{
struct scrub_bio *sbio;
Expand Down Expand Up @@ -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 */
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;
u8 csum[BTRFS_CSUM_SIZE];
Expand Down Expand Up @@ -919,7 +919,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_dev *sdev,
u64 physical;
u64 logical;
u64 generation;
u64 mirror_num;
int mirror_num;

u64 increment = map->stripe_len;
u64 offset;
Expand Down

0 comments on commit e12fa9c

Please sign in to comment.