From 274272421c1f296a1e9dd19daa9a5088418110b6 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Wed, 8 Aug 2007 20:17:12 -0400
Subject: [PATCH] --- yaml --- r: 128431 b: refs/heads/master c:
 409eb95d7f6632d5af32b795244ce68a29e49319 h: refs/heads/master i:   128429:
 7a34a7ed093452d989cdd7fdaccf8670f7c23615   128427:
 d52b42d1ad6499ac1aa472d1f80c4e4c28eef8db   128423:
 f6214a8bcd69dcaee5393f57e95a6ba64a6eb4e6   128415:
 4763d7b12e0ed4f9590087fc5ffc9f234228819d v: v3

---
 [refs]                       |  2 +-
 trunk/fs/btrfs/extent-tree.c | 13 ++++++-------
 trunk/fs/btrfs/transaction.c |  3 +++
 trunk/fs/btrfs/tree-defrag.c |  7 ++-----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 9d6472e6308f..9ffc3ac06cc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26b8003f10569a9155b7539ef5a7379ee0c6b050
+refs/heads/master: 409eb95d7f6632d5af32b795244ce68a29e49319
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index ba50bd7b9a78..120c448f58f8 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -1312,7 +1312,10 @@ static void reada_walk_down(struct btrfs_root *root,
 		BUG_ON(ret);
 		if (refs != 1)
 			continue;
+		mutex_unlock(&root->fs_info->fs_mutex);
 		ret = readahead_tree_block(root, blocknr);
+		cond_resched();
+		mutex_lock(&root->fs_info->fs_mutex);
 		if (ret)
 			break;
 	}
@@ -1445,7 +1448,6 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
 	struct btrfs_path *path;
 	int i;
 	int orig_level;
-	int num_walks = 0;
 	struct btrfs_root_item *root_item = &root->root_item;
 
 	path = btrfs_alloc_path();
@@ -1486,12 +1488,9 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
 			break;
 		if (wret < 0)
 			ret = wret;
-		num_walks++;
-		if (num_walks > 2) {
-			ret = -EAGAIN;
-			get_bh(root->node);
-			break;
-		}
+		ret = -EAGAIN;
+		get_bh(root->node);
+		break;
 	}
 	for (i = 0; i <= orig_level; i++) {
 		if (path->nodes[i]) {
diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c
index e64ecec3f52e..204337c5ca0f 100644
--- a/trunk/fs/btrfs/transaction.c
+++ b/trunk/fs/btrfs/transaction.c
@@ -364,6 +364,9 @@ int btrfs_defrag_dirty_roots(struct btrfs_fs_info *info)
 					break;
 			}
 			root->defrag_running = 0;
+			radix_tree_tag_clear(&info->fs_roots_radix,
+				     (unsigned long)root->root_key.objectid,
+				     BTRFS_ROOT_DEFRAG_TAG);
 		}
 	}
 	btrfs_end_transaction(trans, tree_root);
diff --git a/trunk/fs/btrfs/tree-defrag.c b/trunk/fs/btrfs/tree-defrag.c
index 15d0a486fb59..7ea66b4aa5c2 100644
--- a/trunk/fs/btrfs/tree-defrag.c
+++ b/trunk/fs/btrfs/tree-defrag.c
@@ -148,7 +148,6 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
 	int level;
 	int orig_level;
 	int i;
-	int num_runs = 0;
 
 	if (root->ref_cows == 0) {
 		goto out;
@@ -200,10 +199,8 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
 			break;
 		if (wret < 0)
 			ret = wret;
-		if (num_runs++ > 8) {
-			ret = -EAGAIN;
-			break;
-		}
+		ret = -EAGAIN;
+		break;
 	}
 	for (i = 0; i <= orig_level; i++) {
 		if (path->nodes[i]) {