From b2034a61bb57b7b7ba6aedc5d762dd0a9357f159 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Tue, 22 Jul 2008 12:08:37 -0400 Subject: [PATCH] --- yaml --- r: 128839 b: refs/heads/master c: e34a5b4f77b8448cf2863ad0cbac35e2c2a86a0a h: refs/heads/master i: 128837: 70b9184fea5c912946892760aaa186028dc920bb 128835: 06e2c038502afe27e11c6161e2ee4b5115a202cd 128831: e1dab7690e1b10be3cc280fa6693e2374728c740 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b4c0f89a9bfe..500452c27dd6 100644 --- 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 index c51cd11de206..72fa28236e5d 100644 --- 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)