---

yaml --- r: 374886 b: refs/heads/master c: 0a3896d h: refs/heads/master v: v3
git-mirror · May 6, 2013 · cc63b0b · cc63b0b
1 parent d032e1d
commit cc63b0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62dbd7176e196cd042c5542696981b268264fe92
+refs/heads/master: 0a3896d0f563d4472c75ab2c26afd8940d24b5a1
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -419,15 +419,20 @@ static noinline void caching_thread(struct btrfs_work *work)
 			if (ret)
 				break;
 
-			if (need_resched() ||
-			    btrfs_next_leaf(extent_root, path)) {
+			if (need_resched()) {
 				caching_ctl->progress = last;
 				btrfs_release_path(path);
 				up_read(&fs_info->extent_commit_sem);
 				mutex_unlock(&caching_ctl->mutex);
 				cond_resched();
 				goto again;
 			}
+
+			ret = btrfs_next_leaf(extent_root, path);
+			if (ret < 0)
+				goto err;
+			if (ret)
+				break;
 			leaf = path->nodes[0];
 			nritems = btrfs_header_nritems(leaf);
 			continue;