aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Schmidt <list.btrfs@jan-o-sch.net>2011-06-17 09:55:21 -0400
committerJan Schmidt <list.btrfs@jan-o-sch.net>2011-09-29 06:54:28 -0400
commite12fa9cd390f8e93a9144bd99bd6f6ed316fbc1e (patch)
treeb4033a6adfc7e2072ead760e85248e9d567aa0d1 /fs
parent8ddc7d9cd0a00062247c732b96386ec2462bdbc7 (diff)
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: Jan Schmidt <list.btrfs@jan-o-sch.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/scrub.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 59caf8fcd1c7..41a01147b959 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -65,7 +65,7 @@ static void scrub_fixup(struct scrub_bio *sbio, int ix);
65struct scrub_page { 65struct scrub_page {
66 u64 flags; /* extent flags */ 66 u64 flags; /* extent flags */
67 u64 generation; 67 u64 generation;
68 u64 mirror_num; 68 int mirror_num;
69 int have_csum; 69 int have_csum;
70 u8 csum[BTRFS_CSUM_SIZE]; 70 u8 csum[BTRFS_CSUM_SIZE];
71}; 71};
@@ -776,7 +776,7 @@ nomem:
776} 776}
777 777
778static int scrub_page(struct scrub_dev *sdev, u64 logical, u64 len, 778static int scrub_page(struct scrub_dev *sdev, u64 logical, u64 len,
779 u64 physical, u64 flags, u64 gen, u64 mirror_num, 779 u64 physical, u64 flags, u64 gen, int mirror_num,
780 u8 *csum, int force) 780 u8 *csum, int force)
781{ 781{
782 struct scrub_bio *sbio; 782 struct scrub_bio *sbio;
@@ -873,7 +873,7 @@ static int scrub_find_csum(struct scrub_dev *sdev, u64 logical, u64 len,
873 873
874/* scrub extent tries to collect up to 64 kB for each bio */ 874/* scrub extent tries to collect up to 64 kB for each bio */
875static int scrub_extent(struct scrub_dev *sdev, u64 logical, u64 len, 875static int scrub_extent(struct scrub_dev *sdev, u64 logical, u64 len,
876 u64 physical, u64 flags, u64 gen, u64 mirror_num) 876 u64 physical, u64 flags, u64 gen, int mirror_num)
877{ 877{
878 int ret; 878 int ret;
879 u8 csum[BTRFS_CSUM_SIZE]; 879 u8 csum[BTRFS_CSUM_SIZE];
@@ -919,7 +919,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_dev *sdev,
919 u64 physical; 919 u64 physical;
920 u64 logical; 920 u64 logical;
921 u64 generation; 921 u64 generation;
922 u64 mirror_num; 922 int mirror_num;
923 923
924 u64 increment = map->stripe_len; 924 u64 increment = map->stripe_len;
925 u64 offset; 925 u64 offset;