diff options
| author | Omar Sandoval <osandov@fb.com> | 2015-09-29 20:51:45 -0700 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-01-12 15:02:54 +0100 |
| commit | e4797df6a9fac329fdb168f8fd6bf1925ead3c28 (patch) | |
| tree | b654c6f772fa2506638c8a3d3dae0a5bbe32d6a1 /cmds-check.c | |
| parent | d8c537e71f3dce8a8d03dddfcbcac71ef2e2cdc4 (diff) | |
btrfs-progs: check the free space tree in btrfsck
This reuses the existing code for checking the free space cache, we just
need to load the free space tree. While we do that, we check a couple of
invariants on the free space tree itself. This requires pulling in some
code from the kernel to exclude the super stripes.
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-check.c')
| -rw-r--r-- | cmds-check.c | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/cmds-check.c b/cmds-check.c index e7516569..680fc875 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -35,6 +35,7 @@ #include "utils.h" #include "commands.h" #include "free-space-cache.h" +#include "free-space-tree.h" #include "btrfsck.h" #include "qgroup-verify.h" #include "rbtree-utils.h" @@ -5476,9 +5477,29 @@ static int check_space_cache(struct btrfs_root *root) btrfs_remove_free_space_cache(cache); } - ret = load_free_space_cache(root->fs_info, cache); - if (!ret) - continue; + if (btrfs_fs_compat_ro(root->fs_info, + BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE)) { + ret = exclude_super_stripes(root, cache); + if (ret) { + fprintf(stderr, "could not exclude super stripes: %s\n", + strerror(-ret)); + error++; + continue; + } + ret = load_free_space_tree(root->fs_info, cache); + free_excluded_extents(root, cache); + if (ret < 0) { + fprintf(stderr, "could not load free space tree: %s\n", + strerror(-ret)); + error++; + continue; + } + error += ret; + } else { + ret = load_free_space_cache(root->fs_info, cache); + if (!ret) + continue; + } ret = verify_space_cache(root, cache); if (ret) { @@ -9717,8 +9738,12 @@ int cmd_check(int argc, char **argv) goto close_out; } - if (!ctx.progress_enabled) - fprintf(stderr, "checking free space cache\n"); + if (!ctx.progress_enabled) { + if (btrfs_fs_compat_ro(info, BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE)) + fprintf(stderr, "checking free space tree\n"); + else + fprintf(stderr, "checking free space cache\n"); + } ret = check_space_cache(root); if (ret) goto out; |