diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-09-22 14:47:57 +0100 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-09-22 14:47:57 +0100 |
| commit | c92ba05933a640c0084321bc6eeaa091c283b8bb (patch) | |
| tree | 72cdcdec5d50586a244ba8743356d3fd2ecb1b4c /cmds-check.c | |
| parent | 249a3592d5dfdec0e52b5e9e712339364ea758ed (diff) | |
New upstream release.
Diffstat (limited to 'cmds-check.c')
| -rw-r--r-- | cmds-check.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cmds-check.c b/cmds-check.c index a453696e..df97d3b6 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -9063,9 +9063,10 @@ static int check_tree_block_backref(struct btrfs_fs_info *fs_info, u64 root_id, free_extent_buffer(eb); btrfs_init_path(&path); + path.lowest_level = level; /* Search with the first key, to ensure we can reach it */ ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0); - if (ret) { + if (ret < 0) { err |= REFERENCER_MISSING; goto release_out; } @@ -9948,6 +9949,8 @@ static int traverse_tree_block(struct btrfs_root *root, struct extent_buffer *node) { struct extent_buffer *eb; + struct btrfs_key key; + struct btrfs_key drop_key; int level; u64 nr; int i; @@ -9993,6 +9996,7 @@ static int traverse_tree_block(struct btrfs_root *root, } nr = btrfs_header_nritems(node); + btrfs_disk_key_to_cpu(&drop_key, &root->root_item.drop_progress); btree_space_waste += (BTRFS_NODEPTRS_PER_BLOCK(root) - nr) * sizeof(struct btrfs_key_ptr); @@ -10000,6 +10004,11 @@ static int traverse_tree_block(struct btrfs_root *root, for (i = 0; i < nr; i++) { u64 blocknr = btrfs_node_blockptr(node, i); + btrfs_node_key_to_cpu(node, &key, i); + if (level == root->root_item.drop_level && + is_dropped_key(&key, &drop_key)) + continue; + /* * As a btrfs tree has most 8 levels (0..7), so it's quite safe * to call the function itself. |