From 6fc1edc4c03fd4e9dc3e6cb6b025ab10bb933198 Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Mon, 14 May 2018 14:13:34 +0300 Subject: btrfs-progs: corrupt-block: Fix -D option Currently the -D option is essentially defunct since it's the root, where we are going to corrupt a dir item is always set to the tree root. Fix this by passing the root from the "-r" option. Aditionally convert the interface for this option to the new format. So if one wants to corrupt a dir item in the default fs tree, they should now invoke: btrfs-corrupt-block -r 5 -D -f name Signed-off-by: Nikolay Borisov Signed-off-by: David Sterba --- btrfs-corrupt-block.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'btrfs-corrupt-block.c') diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index a229563d..4fbea26c 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -117,7 +117,7 @@ static void print_usage(int ret) printf("\t-K Corrupt the given key (must also specify -f for the field and optionally -r for the root)\n"); printf("\t-f The field in the item to corrupt\n"); printf("\t-I Corrupt an item corresponding to the passed key triplet (must also specify the field to corrupt and root for the item)\n"); - printf("\t-D Corrupt a dir item, must specify key and field\n"); + printf("\t-D Corrupt a dir item corresponding to the passed key triplet, must also specify a field\n"); printf("\t-d Delete item corresponding to passed key triplet\n"); printf("\t-r Operate on this root (only works with -d)\n"); printf("\t-C Delete a csum for the specified bytenr. When used with -b it'll delete that many bytes, otherwise it's just sectorsize\n"); @@ -1165,7 +1165,7 @@ int main(int argc, char **argv) { NULL, 0, NULL, 0 } }; - c = getopt_long(argc, argv, "l:c:b:eEkuUi:f:x:m:K:I:Dd:r:C:", + c = getopt_long(argc, argv, "l:c:b:eEkuUi:f:x:m:K:I:D:d:r:C:", long_options, NULL); if (c < 0) break; @@ -1212,6 +1212,7 @@ int main(int argc, char **argv) break; case 'D': corrupt_di = 1; + parse_key(&key.objectid, &key.type, &key.offset); break; case 'I': corrupt_item = 1; @@ -1338,7 +1339,7 @@ int main(int argc, char **argv) if (corrupt_di) { if (!key.objectid || *field == 0) print_usage(1); - ret = corrupt_dir_item(root, &key, field); + ret = corrupt_dir_item(target_root, &key, field); goto out_close; } if (csum_bytenr) { -- cgit v1.2.3