marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-restore: deal with NULL returns from read_node_slot 

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
master
Chris Mason 2013-07-05 13:44:07 -04:00
parent 8b5d89be6d
commit 194aa4a1bd
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmds-restore.c
View File

@ -152,9 +152,11 @@ int next_leaf(struct btrfs_root *root, struct btrfs_path *path)
{
int slot;
int level = 1;
int offset = 1;
struct extent_buffer *c;
struct extent_buffer *next = NULL;
again:
for (; level < BTRFS_MAX_LEVEL; level++) {
if (path->nodes[level])
break;
@ -169,7 +171,7 @@ int next_leaf(struct btrfs_root *root, struct btrfs_path *path)
if (!path->nodes[level])
return 1;
slot = path->slots[level] + 1;
slot = path->slots[level] + offset;
c = path->nodes[level];
if (slot >= btrfs_header_nritems(c)) {
level++;
@ -182,7 +184,9 @@ int next_leaf(struct btrfs_root *root, struct btrfs_path *path)
reada_for_search(root, path, level, slot, 0);
next = read_node_slot(root, c, slot);
break;
if (next)
break;
offset++;
}
path->slots[level] = slot;
while(1) {
@ -196,6 +200,8 @@ int next_leaf(struct btrfs_root *root, struct btrfs_path *path)
if (path->reada)
reada_for_search(root, path, level, 0, 0);
next = read_node_slot(root, next, 0);
if (!next)
goto again;
}
return 0;
}

3
ctree.c
View File

@ -797,7 +797,8 @@ struct extent_buffer *read_node_slot(struct btrfs_root *root,
if (slot >= btrfs_header_nritems(parent))
return NULL;
BUG_ON(level == 0);
if (level == 0)
return NULL;
return read_tree_block(root, btrfs_node_blockptr(parent, slot),
btrfs_level_size(root, level - 1),