---

yaml --- r: 252345 b: refs/heads/master c: 00d01bc h: refs/heads/master i: 252343: dc216b4 v: v3
git-mirror · May 26, 2011 · 9cce532 · 9cce532
1 parent 53930dc
commit 9cce532
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c309df07868baa8b05d2a70637096465746fdbb5
+refs/heads/master: 00d01bc17cc2807292303961519d9c005794eb1d
diff --git a/trunk/fs/btrfs/scrub.c b/trunk/fs/btrfs/scrub.c
@@ -631,7 +631,8 @@ static int scrub_page(struct scrub_dev *sdev, u64 logical, u64 len,
 	if (sbio->count == 0) {
 		sbio->physical = physical;
 		sbio->logical = logical;
-	} else if (sbio->physical + sbio->count * PAGE_SIZE != physical) {
+	} else if (sbio->physical + sbio->count * PAGE_SIZE != physical ||
+		   sbio->logical + sbio->count * PAGE_SIZE != logical) {
 		scrub_submit(sdev);
 		goto again;
 	}