From: Arne Jansen <sensille@gmx.net>
Date: Wed, 25 May 2011 12:22:50 +0000 (+0000)
Subject: btrfs scrub: don't coalesce pages that are logically discontiguous
X-Git-Tag: v3.0-rc1~38^2~2
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=00d01bc17cc2807292303961519d9c005794eb1d;p=linux%2F.git

btrfs scrub: don't coalesce pages that are logically discontiguous

scrub_page collects several pages into one bio as long as they are physically
contiguous. As we only save one logical address for the whole bio, don't
collect pages that are physically contiguous but logically discontiguous.

Signed-off-by: Arne Jansen <sensille@gmx.net>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 87a2f1273136..6dfed0c27ac3 100644
--- a/fs/btrfs/scrub.c
+++ b/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;
 	}