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

btrfs-progs: corrupt-block: Factor out specific-root code 

Some options operate on a specific root so let's extract the code which
deals with this. No functional change.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Nikolay Borisov 2018-05-14 14:13:26 +03:00 committed by David Sterba
parent bb9b8bcfd9
commit 12087e6d75
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
btrfs-corrupt-block.c
View File

@ -1080,6 +1080,26 @@ out:
return ret;
}
static struct btrfs_root *open_root(struct btrfs_fs_info *fs_info,
u64 root_objectid)
{
struct btrfs_key root_key;
struct btrfs_root *root;
root_key.objectid = root_objectid;
root_key.type = BTRFS_ROOT_ITEM_KEY;
root_key.offset = (u64)-1;
root = btrfs_read_fs_root(fs_info, &root_key);
if (IS_ERR(root)) {
fprintf(stderr, "couldn't find root %llu\n", root_objectid);
print_usage(1);
}
return root;
}
int main(int argc, char **argv)
{
struct cache_tree root_cache;
@ -1326,20 +1346,9 @@ int main(int argc, char **argv)
if (!key.objectid)
print_usage(1);
if (root_objectid) {
struct btrfs_key root_key;
if (root_objectid)
target = open_root(root->fs_info, root_objectid);
root_key.objectid = root_objectid;
root_key.type = BTRFS_ROOT_ITEM_KEY;
root_key.offset = (u64)-1;
target = btrfs_read_fs_root(root->fs_info, &root_key);
if (IS_ERR(target)) {
fprintf(stderr, "Couldn't find root %llu\n",
(unsigned long long)root_objectid);
print_usage(1);
}
}
ret = delete_item(target, &key);
goto out_close;
}