From: Nikolay Borisov <nborisov@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH 6/9] btrfs-progs: btrfs-corrupt-block: Factor out common "-r" handling code
Date: Mon, 14 May 2018 14:13:31 +0300 [thread overview]
Message-ID: <1526296414-27638-7-git-send-email-nborisov@suse.com> (raw)
In-Reply-To: <1526296414-27638-1-git-send-email-nborisov@suse.com>
Since more and more of the "corrupt XXX" options are going to support
combination with -r option, let's extract the common code needed for
this. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
btrfs-corrupt-block.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c
index 7a5513c455e6..8bbfe1cdb855 100644
--- a/btrfs-corrupt-block.c
+++ b/btrfs-corrupt-block.c
@@ -1114,7 +1114,7 @@ int main(int argc, char **argv)
{
struct cache_tree root_cache;
struct btrfs_key key;
- struct btrfs_root *root;
+ struct btrfs_root *root, *target_root;
char *dev;
/* chunk offset can be 0,so change to (u64)-1 */
u64 logical = (u64)-1;
@@ -1245,6 +1245,10 @@ int main(int argc, char **argv)
fprintf(stderr, "Open ctree failed\n");
exit(1);
}
+ target_root = root;
+ if (root_objectid)
+ target_root = open_root(root->fs_info, root_objectid);
+
if (extent_rec) {
struct btrfs_trans_handle *trans;
@@ -1342,26 +1346,19 @@ int main(int argc, char **argv)
goto out_close;
}
if (corrupt_item) {
- struct btrfs_root *target;
if (!key.objectid)
print_usage(1);
if (!root_objectid)
print_usage(1);
- target = open_root(root->fs_info, root_objectid);
-
- ret = corrupt_btrfs_item(target, &key, field);
+ ret = corrupt_btrfs_item(target_root, &key, field);
goto out_close;
}
if (delete) {
- struct btrfs_root *target = root;
-
if (!key.objectid)
print_usage(1);
- if (root_objectid)
- target = open_root(root->fs_info, root_objectid);
- ret = delete_item(target, &key);
+ ret = delete_item(target_root, &key);
goto out_close;
}
if (should_corrupt_key) {
--
2.7.4
next prev parent reply other threads:[~2018-05-14 11:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 11:13 [PATCH 0/9] Overhaul btrfs-corrupt-block Nikolay Borisov
2018-05-14 11:13 ` [PATCH 1/9] btrfs-progs: btrfs-corrupt-block: Factor out specific-root code Nikolay Borisov
2018-05-14 11:13 ` [PATCH 2/9] btrfs-progs: btrfs-corrupt-block: Correctly handle -r when passing -I Nikolay Borisov
2018-05-14 11:13 ` [PATCH 3/9] btrfs-progs: btrfs-corrupt-block: Factor out key parsing function Nikolay Borisov
2018-05-14 11:13 ` [PATCH 4/9] btrfs-progs: btrfs-corrupt-block: Change -I flag parameter format Nikolay Borisov
2018-05-14 11:13 ` [PATCH 5/9] btrfs-progs: btrfs-corrupt-block: Convert -K flag argument handling to common function Nikolay Borisov
2018-05-14 11:13 ` Nikolay Borisov [this message]
2018-05-14 11:13 ` [PATCH 7/9] btrfs-progs: btrfs-corrupt-block: Add support for handling specific root when using -K option Nikolay Borisov
2018-05-14 11:13 ` [PATCH 8/9] btrfs-progs: btrfs-corrupt-block: Change format of -d option Nikolay Borisov
2018-05-14 11:13 ` [PATCH 9/9] btrfs-progs: btrfs-corrupt-block: Fix -D option Nikolay Borisov
2018-05-31 12:18 ` [PATCH 0/9] Overhaul btrfs-corrupt-block David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1526296414-27638-7-git-send-email-nborisov@suse.com \
--to=nborisov@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.