From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 3/5] btrfs-progs: image: Remove all existing dev extents for later rebuild
Date: Tue, 27 Nov 2018 10:33:13 +0800 [thread overview]
Message-ID: <20181127023315.28176-4-wqu@suse.com> (raw)
In-Reply-To: <20181127023315.28176-1-wqu@suse.com>
This patch will remove all existing dev extents for later rebuild.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
image/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/image/main.c b/image/main.c
index 9060f6b1b665..707568f22e01 100644
--- a/image/main.c
+++ b/image/main.c
@@ -2210,6 +2210,70 @@ static void fixup_block_groups(struct btrfs_trans_handle *trans,
}
}
+static int remove_all_dev_extents(struct btrfs_trans_handle *trans,
+ struct btrfs_fs_info *fs_info)
+{
+ struct btrfs_root *root = fs_info->dev_root;
+ struct btrfs_path path;
+ struct btrfs_key key;
+ struct extent_buffer *leaf;
+ int slot;
+ int ret;
+
+ key.objectid = 1;
+ key.type = BTRFS_DEV_EXTENT_KEY;
+ key.offset = 0;
+ btrfs_init_path(&path);
+
+ ret = btrfs_search_slot(trans, root, &key, &path, -1, 1);
+ if (ret < 0) {
+ error("failed to search dev tree: %s", strerror(-ret));
+ return ret;
+ }
+
+ while (1) {
+ slot = path.slots[0];
+ leaf = path.nodes[0];
+ if (slot >= btrfs_header_nritems(leaf)) {
+ ret = btrfs_next_leaf(root, &path);
+ if (ret < 0) {
+ error("failed to search dev tree: %s",
+ strerror(-ret));
+ goto out;
+ }
+ if (ret > 0) {
+ ret = 0;
+ goto out;
+ }
+ }
+
+ btrfs_item_key_to_cpu(leaf, &key, slot);
+ if (key.type != BTRFS_DEV_EXTENT_KEY)
+ break;
+ ret = btrfs_del_item(trans, root, &path);
+ if (ret < 0) {
+ error("failed to delete dev extent %llu, %llu: %s",
+ key.objectid, key.offset, strerror(-ret));
+ goto out;
+ }
+ }
+out:
+ btrfs_release_path(&path);
+ return ret;
+}
+
+static int fixup_dev_extents(struct btrfs_trans_handle *trans,
+ struct btrfs_fs_info *fs_info)
+{
+ int ret;
+
+ ret = remove_all_dev_extents(trans, fs_info);
+ if (ret < 0)
+ error("failed to remove all existing dev extents: %s",
+ strerror(-ret));
+ return ret;
+}
+
static int fixup_chunks_and_devices(struct btrfs_fs_info *fs_info,
struct mdrestore_struct *mdres, off_t dev_size)
{
@@ -2227,6 +2291,10 @@ static int fixup_chunks_and_devices(struct btrfs_fs_info *fs_info,
}
fixup_block_groups(trans, fs_info);
+ ret = fixup_dev_extents(trans, fs_info);
+ if (ret < 0)
+ goto error;
+
ret = fixup_device_size(trans, fs_info, mdres, dev_size);
if (ret < 0)
goto error;
--
2.19.2
next prev parent reply other threads:[~2018-11-27 2:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-27 2:33 [PATCH 0/5] btrfs-progs: image: Fix error when restoring multi-disk image to single disk Qu Wenruo
2018-11-27 2:33 ` [PATCH 1/5] btrfs-progs: image: Refactor fixup_devices() to fixup_chunks_and_devices() Qu Wenruo
2018-11-27 7:13 ` Nikolay Borisov
2018-11-27 7:15 ` Qu Wenruo
2018-11-27 2:33 ` [PATCH 2/5] btrfs-progs: image: Fix block group item flags when restoring multi-device image to single device Qu Wenruo
2018-11-27 7:15 ` Nikolay Borisov
2018-11-27 7:16 ` Qu Wenruo
2018-11-27 2:33 ` Qu Wenruo [this message]
2018-11-27 7:26 ` [PATCH 3/5] btrfs-progs: image: Remove all existing dev extents for later rebuild Nikolay Borisov
2018-11-27 2:33 ` [PATCH 4/5] btrfs-progs: image: Rebuild dev extents using chunk tree Qu Wenruo
2018-11-27 7:28 ` Nikolay Borisov
2018-11-27 7:30 ` Qu Wenruo
2018-11-27 7:35 ` Nikolay Borisov
2018-11-27 2:33 ` [PATCH 5/5] btrfs-progs: misc-tests/021: Do extra btrfs check before mounting Qu Wenruo
2018-11-27 7:29 ` Nikolay Borisov
2018-11-27 7:31 ` Qu Wenruo
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=20181127023315.28176-4-wqu@suse.com \
--to=wqu@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).