---

yaml --- r: 128839 b: refs/heads/master c: e34a5b4 h: refs/heads/master i: 128837: 70b9184 128835: 06e2c03 128831: e1dab76 v: v3
git-mirror · Sep 25, 2008 · b2034a6 · b2034a6
1 parent 0be6622
commit b2034a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dddcbeb28b34620ad033f1e8d9f6960bafdd7d2
+refs/heads/master: e34a5b4f77b8448cf2863ad0cbac35e2c2a86a0a
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -937,6 +937,7 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 	level = btrfs_header_level(buf);
 	nritems = btrfs_header_nritems(buf);
 	for (i = 0; i < nritems; i++) {
+		cond_resched();
 		if (level == 0) {
 			u64 disk_bytenr;
 			btrfs_item_key_to_cpu(buf, &key, i);
@@ -2189,6 +2190,7 @@ static int noinline drop_leaf_ref(struct btrfs_trans_handle *trans,
 
 	for (i = 0; i < nritems; i++) {
 		u64 disk_bytenr;
+		cond_resched();
 
 		btrfs_item_key_to_cpu(leaf, &key, i);
 		if (btrfs_key_type(&key) != BTRFS_EXTENT_DATA_KEY)