From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 27 Mar 2012 14:09:18 +0000 (+0300)
Subject: Btrfs: fix infinite loop in btrfs_shrink_device()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=213e64da90d14537cd63f7090d6c4d1fcc75d9f8;p=mv-sheeva.git

Btrfs: fix infinite loop in btrfs_shrink_device()

If relocate of block group 0 fails with ENOSPC we end up infinitely
looping because key.offset -= 1 statement in that case brings us back to
where we started.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index bcc0acda869..be2d4e0e6cf 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2987,7 +2987,7 @@ again:
 	key.offset = (u64)-1;
 	key.type = BTRFS_DEV_EXTENT_KEY;
 
-	while (1) {
+	do {
 		ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
 		if (ret < 0)
 			goto done;
@@ -3029,8 +3029,7 @@ again:
 			goto done;
 		if (ret == -ENOSPC)
 			failed++;
-		key.offset -= 1;
-	}
+	} while (key.offset-- > 0);
 
 	if (failed && !retried) {
 		failed = 0;