openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Btrfs: fix possible infinite loop in slow caching 

So I noticed there is an infinite loop in the slow caching code.  If we return 1
when we hit the end of the tree, so we could end up caching the last block group
the slow way and suddenly we're looping forever because we just keep
re-searching and trying again.  Fix this by only doing btrfs_next_leaf() if we
don't need_resched().  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
Josef Bacik 2013-04-19 14:37:26 -04:00
parent 62dbd7176e
commit 0a3896d0f5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/btrfs/extent-tree.c
View File

@ -419,8 +419,7 @@ 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);
@ -428,6 +427,12 @@ static noinline void caching_thread(struct btrfs_work *work)
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;