From 14842a4e7fdf9daf816c32bec7bdb45aeb9f573f Mon Sep 17 00:00:00 2001
From: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date: Fri, 17 Jun 2011 15:55:21 +0200
Subject: [PATCH] --- yaml --- r: 274703 b: refs/heads/master c:
 e12fa9cd390f8e93a9144bd99bd6f6ed316fbc1e h: refs/heads/master i:   274701:
 1507893c8b1511536f46524d071d30bd441e27f1   274699:
 87b604cfa979e28a8012618e4a9c89f3a15fd3a2   274695:
 22e27e5bfbb4e98b7496a668383aba20d92d3ec7   274687:
 aec2d0b6453992c4037611a1e917203f138761bd v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/scrub.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fd7bf2e76249..e6c7fc7c468b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ddc7d9cd0a00062247c732b96386ec2462bdbc7
+refs/heads/master: e12fa9cd390f8e93a9144bd99bd6f6ed316fbc1e
diff --git a/trunk/fs/btrfs/scrub.c b/trunk/fs/btrfs/scrub.c
index 59caf8fcd1c7..41a01147b959 100644
--- a/trunk/fs/btrfs/scrub.c
+++ b/trunk/fs/btrfs/scrub.c
@@ -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];
 };
@@ -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;
@@ -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];
@@ -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;