From patchwork Fri Jul 26 09:59:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13742551 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 064AB2D7B8 for ; Fri, 26 Jul 2024 10:00:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721988023; cv=none; b=kQH5tDDfGqzBSSk08a2wjegLjBRoD1GbyWLurtUns3zk/WDSilnpjtVdHXFVEy4MRItS0MxzZPBLdmUGcU5GdGL4hNSkFRRt2twqoD1ZXMGhe9VhfZMC7bdGtboNHtbXJXU7OeOpyqK0g5nlVU37br4wrdQ/egxkyabsUPUwWfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721988023; c=relaxed/simple; bh=6u1ncc+YRQCAgkQruJkN2IFEYQ3EXYMl91N6iBkbEUU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N6TWQoq9/6xZUV2bUV9/Hry4pmBgR6xBBTnkx+omRaHuaiFzdjSnTZLAQs82WAXd4BgB/7L/EIukk8PdyGchZgiNtVOSFVcMZ8cowj/tv5hMuKjmZQ8Gf9R0Vut8eOKAjq9KQBoD7oMVy9XJL0Yt/wTefDldTsHENolmn8PVZ1I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=Ms3cvFum; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=Ms3cvFum; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="Ms3cvFum"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="Ms3cvFum" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4FC4921BD7 for ; Fri, 26 Jul 2024 10:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1721988020; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=58/WfzbK0isUwxAeSCA0JIUqwmVtOyAPijGkyME3gjM=; b=Ms3cvFumSS8N9nQs5dZGWYw5u8ISW2RIcyVo5TTbcAkPGR5RwYr3MUowXIAFVKHhDi4RaH 0dWIWA1ASDljBhJuBS+rPoUHMBNmcswwfrNIb8fltRu9xQ2l3lMYkm9Wu+zfWA+HWfD9De wyRc/kcWlCjJdCOOQ97fCN8rsJ0S7kA= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=Ms3cvFum DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1721988020; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=58/WfzbK0isUwxAeSCA0JIUqwmVtOyAPijGkyME3gjM=; b=Ms3cvFumSS8N9nQs5dZGWYw5u8ISW2RIcyVo5TTbcAkPGR5RwYr3MUowXIAFVKHhDi4RaH 0dWIWA1ASDljBhJuBS+rPoUHMBNmcswwfrNIb8fltRu9xQ2l3lMYkm9Wu+zfWA+HWfD9De wyRc/kcWlCjJdCOOQ97fCN8rsJ0S7kA= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7526B1396E for ; Fri, 26 Jul 2024 10:00:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SK0rDLNzo2YeTwAAD6G6ig (envelope-from ) for ; Fri, 26 Jul 2024 10:00:19 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/3] btrfs-progs: move uuid-tree definitions to kernel-shared/uuid-tree.h Date: Fri, 26 Jul 2024 19:29:53 +0930 Message-ID: <45ed3fd946a07b7ccd3bfda9c3d34c50beb1c7ad.1721987605.git.wqu@suse.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-2.81 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; PREVIOUSLY_DELIVERED(0.00)[linux-btrfs@vger.kernel.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:dkim]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_DN_NONE(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -2.81 X-Rspamd-Queue-Id: 4FC4921BD7 Currently we already have a kernel-shared/uuid-tree.c, which is mostly shared with kernel already. Meanwhile kernel also has a uuid-tree.h, but we are still using ctree.h for the header. Just move all the uuid-tree related definitions to kernel-shared/uuid-tree.h, making future code sync easier. Signed-off-by: Qu Wenruo --- common/send-utils.c | 1 + kernel-shared/ctree.h | 11 ----------- kernel-shared/uuid-tree.c | 1 + kernel-shared/uuid-tree.h | 33 +++++++++++++++++++++++++++++++++ mkfs/main.c | 1 + 5 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 kernel-shared/uuid-tree.h diff --git a/common/send-utils.c b/common/send-utils.c index 173333e30a38..8c13ffa1e106 100644 --- a/common/send-utils.c +++ b/common/send-utils.c @@ -29,6 +29,7 @@ #include "kernel-shared/uapi/btrfs_tree.h" #include "kernel-shared/uapi/btrfs.h" #include "kernel-shared/ctree.h" +#include "kernel-shared/uuid-tree.h" #include "common/send-utils.h" #include "common/messages.h" #include "common/utils.h" diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h index 2388879d1db3..7761b3f6fb1b 100644 --- a/kernel-shared/ctree.h +++ b/kernel-shared/ctree.h @@ -1192,15 +1192,6 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, const char *name, int name_len, u64 ino, u64 parent_ino, u64 *index); -/* uuid-tree.c, interface for mounted mounted filesystem */ -int btrfs_lookup_uuid_subvol_item(int fd, const u8 *uuid, u64 *subvol_id); -int btrfs_lookup_uuid_received_subvol_item(int fd, const u8 *uuid, - u64 *subvol_id); - -/* uuid-tree.c, interface for unmounte filesystem */ -int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type, - u64 subid); - static inline int is_fstree(u64 rootid) { if (rootid == BTRFS_FS_TREE_OBJECTID || @@ -1209,8 +1200,6 @@ static inline int is_fstree(u64 rootid) return 0; } -void btrfs_uuid_to_key(const u8 *uuid, u8 type, struct btrfs_key *key); - /* inode.c */ int btrfs_find_free_dir_index(struct btrfs_root *root, u64 dir_ino, u64 *ret_ino); diff --git a/kernel-shared/uuid-tree.c b/kernel-shared/uuid-tree.c index 766cd31e4234..26359520d57c 100644 --- a/kernel-shared/uuid-tree.c +++ b/kernel-shared/uuid-tree.c @@ -29,6 +29,7 @@ #include "kernel-shared/ctree.h" #include "kernel-shared/messages.h" #include "kernel-shared/transaction.h" +#include "kernel-shared/uuid-tree.h" #include "common/messages.h" #include "common/utils.h" diff --git a/kernel-shared/uuid-tree.h b/kernel-shared/uuid-tree.h new file mode 100644 index 000000000000..0cdc2228c44f --- /dev/null +++ b/kernel-shared/uuid-tree.h @@ -0,0 +1,33 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License v2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 021110-1307, USA. + */ + +#ifndef __BTRFS_UUID_TREE_H__ +#define __BTRFS_UUID_TREE_H__ + +#include "kerncompat.h" +#include "kernel-shared/uapi/btrfs_tree.h" + +/* uuid-tree.c, interface for mounted mounted filesystem */ +int btrfs_lookup_uuid_subvol_item(int fd, const u8 *uuid, u64 *subvol_id); +int btrfs_lookup_uuid_received_subvol_item(int fd, const u8 *uuid, + u64 *subvol_id); + +/* uuid-tree.c, interface for unmounte filesystem */ +int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type, + u64 subid); +void btrfs_uuid_to_key(const u8 *uuid, u8 type, struct btrfs_key *key); + +#endif diff --git a/mkfs/main.c b/mkfs/main.c index cf5cae45d02a..9a6047f7296b 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -41,6 +41,7 @@ #include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" #include "kernel-shared/zoned.h" +#include "kernel-shared/uuid-tree.h" #include "crypto/hash.h" #include "common/defs.h" #include "common/internal.h" From patchwork Fri Jul 26 09:59:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13742552 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B92617799F for ; Fri, 26 Jul 2024 10:00:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721988025; cv=none; b=VOyYGjUV6uueBIl59EDyaZexdG6X8sfAJs0q03gBmInXVDHq7jxs8ZFUbqPcEKv72ZWNegQwoC61KLAIXCGG3wMUT7sX7UsQhPF3qSjMp3f93t4wAEtsXIOntN4hQtZTzrqV/DM7VZY6al25dSusxkxuOaiwvOvs1ImU644Ct6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721988025; c=relaxed/simple; bh=jiOQGdqTXiJoM9cT0glpfVv0+pKqf8r+1qIonRhUw0g=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OuBI18yLZz1PM4CEmMVF5wgPScZA8rjStAcz4gNdpEkvppYMy9F61C+XNo1ToJifG7oBptFOubYEgFhetfgSXOnUb9lk0xYaNb1tCGvXUganigkEvQ/CTptRytGpAC6EnlfalRqdXOb9lPMeNb8+oBpLEsPNosPIVYAWa10YG8A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=bofij1bX; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=bofij1bX; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="bofij1bX"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="bofij1bX" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AFCA11F892 for ; Fri, 26 Jul 2024 10:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1721988021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZYdfK/URMOab9c1BPg6H7KlCfiVCHHObG/MvHjtFHUo=; b=bofij1bXWcEbNc8p155LA40c20j4TmPq7DlDGL75P3EZXtOG0fxFhK9omeVVAZkkOjf9zV Ait+D3yXUeCldX0Nugyo8UyBwG+PuprvGsP+jG4k+ylXhseKAE2wC3H6UZKI+UKePBoDev zDngOQWZ1LuX2fzJ2/weStxk0zgvSHU= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=bofij1bX DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1721988021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZYdfK/URMOab9c1BPg6H7KlCfiVCHHObG/MvHjtFHUo=; b=bofij1bXWcEbNc8p155LA40c20j4TmPq7DlDGL75P3EZXtOG0fxFhK9omeVVAZkkOjf9zV Ait+D3yXUeCldX0Nugyo8UyBwG+PuprvGsP+jG4k+ylXhseKAE2wC3H6UZKI+UKePBoDev zDngOQWZ1LuX2fzJ2/weStxk0zgvSHU= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D225D1396E for ; Fri, 26 Jul 2024 10:00:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4CvqIrRzo2YeTwAAD6G6ig (envelope-from ) for ; Fri, 26 Jul 2024 10:00:20 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 2/3] btrfs-progs: cross-port btrfs_uuid_tree_add() from kernel Date: Fri, 26 Jul 2024 19:29:54 +0930 Message-ID: <7f424e054b690d6a0b49f1d508f41df9d3ab5dc8.1721987605.git.wqu@suse.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Action: no action X-Rspamd-Queue-Id: AFCA11F892 X-Spam-Score: -2.81 X-Spam-Level: X-Spam-Flag: NO X-Spamd-Result: default: False [-2.81 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; PREVIOUSLY_DELIVERED(0.00)[linux-btrfs@vger.kernel.org]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:dkim]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[suse.com:+] The modification is minimal: - Replace WARN_ON() with UASSERT() - Remove the @trans parameter for btrfs_extend_item() and btrfs_mark_buffer_dirty() As progs version doesn't need a transaction handler. - Remove the btrfs_uuid_tree_add() in mkfs/main.c Signed-off-by: Qu Wenruo --- kernel-shared/uuid-tree.c | 119 ++++++++++++++++++++++++++++++++++++++ kernel-shared/uuid-tree.h | 2 + mkfs/main.c | 56 ------------------ 3 files changed, 121 insertions(+), 56 deletions(-) diff --git a/kernel-shared/uuid-tree.c b/kernel-shared/uuid-tree.c index 26359520d57c..3b00945d3981 100644 --- a/kernel-shared/uuid-tree.c +++ b/kernel-shared/uuid-tree.c @@ -30,6 +30,7 @@ #include "kernel-shared/messages.h" #include "kernel-shared/transaction.h" #include "kernel-shared/uuid-tree.h" +#include "kernel-shared/disk-io.h" #include "common/messages.h" #include "common/utils.h" @@ -199,3 +200,121 @@ out: btrfs_free_path(path); return ret; } + +/* return -ENOENT for !found, < 0 for errors, or 0 if an item was found */ +static int btrfs_uuid_tree_lookup(struct btrfs_root *uuid_root, const u8 *uuid, + u8 type, u64 subid) +{ + int ret; + struct btrfs_path *path = NULL; + struct extent_buffer *eb; + int slot; + u32 item_size; + unsigned long offset; + struct btrfs_key key; + + UASSERT(uuid_root); + + path = btrfs_alloc_path(); + if (!path) { + ret = -ENOMEM; + goto out; + } + + btrfs_uuid_to_key(uuid, type, &key); + ret = btrfs_search_slot(NULL, uuid_root, &key, path, 0, 0); + if (ret < 0) { + goto out; + } else if (ret > 0) { + ret = -ENOENT; + goto out; + } + + eb = path->nodes[0]; + slot = path->slots[0]; + item_size = btrfs_item_size(eb, slot); + offset = btrfs_item_ptr_offset(eb, slot); + ret = -ENOENT; + + if (!IS_ALIGNED(item_size, sizeof(u64))) { + btrfs_warn(uuid_root->fs_info, + "uuid item with illegal size %lu!", + (unsigned long)item_size); + goto out; + } + while (item_size) { + __le64 data; + + read_extent_buffer(eb, &data, offset, sizeof(data)); + if (le64_to_cpu(data) == subid) { + ret = 0; + break; + } + offset += sizeof(data); + item_size -= sizeof(data); + } + +out: + btrfs_free_path(path); + return ret; +} + +int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, const u8 *uuid, u8 type, + u64 subid_cpu) +{ + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_root *uuid_root = fs_info->uuid_root; + int ret; + struct btrfs_path *path = NULL; + struct btrfs_key key; + struct extent_buffer *eb; + int slot; + unsigned long offset; + __le64 subid_le; + + ret = btrfs_uuid_tree_lookup(uuid_root, uuid, type, subid_cpu); + if (ret != -ENOENT) + return ret; + + UASSERT(uuid_root); + btrfs_uuid_to_key(uuid, type, &key); + + path = btrfs_alloc_path(); + if (!path) { + ret = -ENOMEM; + goto out; + } + + ret = btrfs_insert_empty_item(trans, uuid_root, path, &key, + sizeof(subid_le)); + if (ret == 0) { + /* Add an item for the type for the first time */ + eb = path->nodes[0]; + slot = path->slots[0]; + offset = btrfs_item_ptr_offset(eb, slot); + } else if (ret == -EEXIST) { + /* + * An item with that type already exists. + * Extend the item and store the new subid at the end. + */ + btrfs_extend_item(path, sizeof(subid_le)); + eb = path->nodes[0]; + slot = path->slots[0]; + offset = btrfs_item_ptr_offset(eb, slot); + offset += btrfs_item_size(eb, slot) - sizeof(subid_le); + } else { + btrfs_warn(fs_info, + "insert uuid item failed %d (0x%016llx, 0x%016llx) type %u!", + ret, key.objectid, key.offset, type); + goto out; + } + + ret = 0; + subid_le = cpu_to_le64(subid_cpu); + write_extent_buffer(eb, &subid_le, offset, sizeof(subid_le)); + btrfs_mark_buffer_dirty(eb); + +out: + btrfs_free_path(path); + return ret; +} diff --git a/kernel-shared/uuid-tree.h b/kernel-shared/uuid-tree.h index 0cdc2228c44f..904cabe7ea94 100644 --- a/kernel-shared/uuid-tree.h +++ b/kernel-shared/uuid-tree.h @@ -29,5 +29,7 @@ int btrfs_lookup_uuid_received_subvol_item(int fd, const u8 *uuid, int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type, u64 subid); void btrfs_uuid_to_key(const u8 *uuid, u8 type, struct btrfs_key *key); +int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, const u8 *uuid, u8 type, + u64 subid_cpu); #endif diff --git a/mkfs/main.c b/mkfs/main.c index 9a6047f7296b..b95f1c3372a3 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -736,62 +736,6 @@ static void update_chunk_allocation(struct btrfs_fs_info *fs_info, } } -static int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, - u8 type, u64 subvol_id_cpu) -{ - struct btrfs_fs_info *fs_info = trans->fs_info; - struct btrfs_root *uuid_root = fs_info->uuid_root; - int ret; - struct btrfs_path *path = NULL; - struct btrfs_key key; - struct extent_buffer *eb; - int slot; - unsigned long offset; - __le64 subvol_id_le; - - btrfs_uuid_to_key(uuid, type, &key); - - path = btrfs_alloc_path(); - if (!path) { - ret = -ENOMEM; - goto out; - } - - ret = btrfs_insert_empty_item(trans, uuid_root, path, &key, sizeof(subvol_id_le)); - if (ret < 0 && ret != -EEXIST) { - warning( - "inserting uuid item failed (0x%016llx, 0x%016llx) type %u: %d", - key.objectid, key.offset, type, ret); - goto out; - } - - if (ret >= 0) { - /* Add an item for the type for the first time. */ - eb = path->nodes[0]; - slot = path->slots[0]; - offset = btrfs_item_ptr_offset(eb, slot); - } else { - /* - * ret == -EEXIST case, an item with that type already exists. - * Extend the item and store the new subvol_id at the end. - */ - btrfs_extend_item(path, sizeof(subvol_id_le)); - eb = path->nodes[0]; - slot = path->slots[0]; - offset = btrfs_item_ptr_offset(eb, slot); - offset += btrfs_item_size(eb, slot) - sizeof(subvol_id_le); - } - - ret = 0; - subvol_id_le = cpu_to_le64(subvol_id_cpu); - write_extent_buffer(eb, &subvol_id_le, offset, sizeof(subvol_id_le)); - btrfs_mark_buffer_dirty(eb); - -out: - btrfs_free_path(path); - return ret; -} - static int create_uuid_tree(struct btrfs_trans_handle *trans) { struct btrfs_fs_info *fs_info = trans->fs_info; From patchwork Fri Jul 26 09:59:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13742553 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D390F178393 for ; Fri, 26 Jul 2024 10:00:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721988027; cv=none; b=Ayuus3YrWGlKdMqwqmSGOntQhiW8VqbHVXF8TQptLLeogdupX8tsbsTHxTpRhGphhvB6BsxmbZR+k3UWJpZrrBXR7yriP5WW/bj6G7AzI/l7JtBif7K9gT9fQoS/TjSNYJLLRyJVBTw0OdPDPU5iJ2srNOMQum8uQiEszxSoODU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721988027; c=relaxed/simple; bh=HmL6hDvr1NKwnN2dZ3Ph2IiYbsAG4OO47155e7DD3KA=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IZBMxxpfeFLJiNbzNpjaD5a3iXhiI9x4xXfYyKedZdIPAn3q6WY+kBVtP9eMJeyRr5BlkUZDRg3OPxPydxvzsxnGvH5KjJNjPJ+QKINm5ycw03K3EPnQMSG7BdwQXue+0CbKarjdwxKBnJ0VKNy4EE7uPAT2kp3rCSYgIFWLuv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=WbDfNStj; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=WbDfNStj; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="WbDfNStj"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="WbDfNStj" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1916B1F894 for ; Fri, 26 Jul 2024 10:00:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1721988023; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QH+h60tIpaWjOALgXTs5FIhcpn6udYaDvRTYHq3TzXA=; b=WbDfNStjpbplGfgdokWGr3stHxeFbaRiPm1uGjxlwx47kcGxsasq6Ks5+M3ZWN736x8JKA nczd0CF82lhHTRhPEz7IjY6lVIWcrRs2wI5i7oLLqPkZReBtTZzAOW8Gkmn0jQYpeUNkge xqFLCh51RNu1L9ss1xklZalQHqQKPeI= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=WbDfNStj DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1721988023; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QH+h60tIpaWjOALgXTs5FIhcpn6udYaDvRTYHq3TzXA=; b=WbDfNStjpbplGfgdokWGr3stHxeFbaRiPm1uGjxlwx47kcGxsasq6Ks5+M3ZWN736x8JKA nczd0CF82lhHTRhPEz7IjY6lVIWcrRs2wI5i7oLLqPkZReBtTZzAOW8Gkmn0jQYpeUNkge xqFLCh51RNu1L9ss1xklZalQHqQKPeI= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3D0F61396E for ; Fri, 26 Jul 2024 10:00:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OCENOrVzo2YeTwAAD6G6ig (envelope-from ) for ; Fri, 26 Jul 2024 10:00:21 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 3/3] btrfs-progs: introduce btrfs_rebuild_uuid_tree() for mkfs and btrfs-convert Date: Fri, 26 Jul 2024 19:29:55 +0930 Message-ID: <8e33931a4d078d1e1aa620aa5fe717f35146ef31.1721987605.git.wqu@suse.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-2.81 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; PREVIOUSLY_DELIVERED(0.00)[linux-btrfs@vger.kernel.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:dkim]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; TO_DN_NONE(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -2.81 X-Rspamd-Queue-Id: 1916B1F894 Currently mkfs uses its own create_uuid_tree(), but that function is only handling FS_TREE. This means for btrfs-convert, we do not generate the uuid tree, nor add the UUID of the image subvolume. This can be a problem if we're going to support multiple subvolumes during mkfs time. To address this inconvenience, this patch introduces a new helper, btrfs_rebuild_uuid_tree(), which will: - Create a new uuid tree if there is not one - Empty the existing uuid tree - Iterate through all subvolumes * If the subvolume has no valid UUID, regenerate one * Add the uuid entry for the subvolume UUID * If the subvolume has received UUID, also add it to UUID tree By this, this new helper can handle all the uuid tree generation needs for: - Current mkfs Only one uuid entry for FS_TREE - Current btrfs-convert Only FS_TREE and the image subvolume - Future multi-subvolume mkfs As we do the scan for all subvolumes. - Future "btrfs rescue rebuild-uuid-tree" Signed-off-by: Qu Wenruo --- common/root-tree-utils.c | 265 +++++++++++++++++++++++++++++++++++++++ common/root-tree-utils.h | 1 + convert/main.c | 5 + mkfs/main.c | 37 +----- 4 files changed, 274 insertions(+), 34 deletions(-) diff --git a/common/root-tree-utils.c b/common/root-tree-utils.c index 6a57c51a8a74..13f89dbd5293 100644 --- a/common/root-tree-utils.c +++ b/common/root-tree-utils.c @@ -15,9 +15,11 @@ */ #include +#include #include "common/root-tree-utils.h" #include "common/messages.h" #include "kernel-shared/disk-io.h" +#include "kernel-shared/uuid-tree.h" int btrfs_make_root_dir(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid) @@ -212,3 +214,266 @@ abort: btrfs_abort_transaction(trans, ret); return ret; } + +static int empty_tree(struct btrfs_root *root) +{ + struct btrfs_trans_handle *trans; + struct btrfs_path path = { 0 }; + struct btrfs_key key = { 0 }; + int ret; + + trans = btrfs_start_transaction(root, 1); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + errno = -ret; + error_msg(ERROR_MSG_START_TRANS, "emptry tree: %m"); + return ret; + } + while (true) { + int nr_items; + + ret = btrfs_search_slot(trans, root, &key, &path, -1, 1); + if (ret < 0) { + errno = -ret; + error("failed to locate the first key of root %lld: %m", + root->root_key.objectid); + btrfs_abort_transaction(trans, ret); + return ret; + } + UASSERT(ret > 0); + nr_items = btrfs_header_nritems(path.nodes[0]); + /* The tree is empty. */ + if (nr_items == 0) { + btrfs_release_path(&path); + break; + } + ret = btrfs_del_items(trans, root, &path, 0, nr_items); + btrfs_release_path(&path); + if (ret < 0) { + errno = -ret; + error("failed to empty the first leaf of root %lld: %m", + root->root_key.objectid); + btrfs_abort_transaction(trans, ret); + return ret; + } + } + ret = btrfs_commit_transaction(trans, root); + if (ret < 0) { + errno = -ret; + error_msg(ERROR_MSG_COMMIT_TRANS, "empty tree: %m"); + } + return ret; +} + +static int rescan_subvol_uuid(struct btrfs_trans_handle *trans, + struct btrfs_key *subvol_key) +{ + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_root *subvol; + int ret; + + UASSERT(is_fstree(subvol_key->objectid)); + + /* + * Read out the subvolume root and updates root::root_item. + * This is to avoid de-sync between in-memory and on-disk root_items. + */ + subvol = btrfs_read_fs_root(fs_info, subvol_key); + if (IS_ERR(subvol)) { + ret = PTR_ERR(subvol); + error("failed to read subvolume %llu: %m", + subvol_key->objectid); + btrfs_abort_transaction(trans, ret); + return ret; + } + /* The uuid is not set, regenerate one. */ + if (uuid_is_null(subvol->root_item.uuid)) { + uuid_generate(subvol->root_item.uuid); + ret = btrfs_update_root(trans, fs_info->tree_root, &subvol->root_key, + &subvol->root_item); + if (ret < 0) { + error("failed to update subvolume %llu: %m", + subvol_key->objectid); + btrfs_abort_transaction(trans, ret); + return ret; + } + } + ret = btrfs_uuid_tree_add(trans, subvol->root_item.uuid, + BTRFS_UUID_KEY_SUBVOL, + subvol->root_key.objectid); + if (ret < 0) { + errno = -ret; + error("failed to add uuid for subvolume %llu: %m", + subvol_key->objectid); + btrfs_abort_transaction(trans, ret); + return ret; + } + if (!uuid_is_null(subvol->root_item.received_uuid)) { + ret = btrfs_uuid_tree_add(trans, subvol->root_item.uuid, + BTRFS_UUID_KEY_RECEIVED_SUBVOL, + subvol->root_key.objectid); + if (ret < 0) { + errno = -ret; + error("failed to add received_uuid for subvol %llu: %m", + subvol->root_key.objectid); + btrfs_abort_transaction(trans, ret); + return ret; + } + } + return 0; +} + +static int rescan_uuid_tree(struct btrfs_fs_info *fs_info) +{ + struct btrfs_root *tree_root = fs_info->tree_root; + struct btrfs_root *uuid_root = fs_info->uuid_root; + struct btrfs_trans_handle *trans; + struct btrfs_path path = { 0 }; + struct btrfs_key key = { 0 }; + int ret; + + UASSERT(uuid_root); + trans = btrfs_start_transaction(uuid_root, 1); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + errno = -ret; + error_msg(ERROR_MSG_START_TRANS, "rescan uuid tree: %m"); + return ret; + } + key.objectid = BTRFS_LAST_FREE_OBJECTID; + key.type = BTRFS_ROOT_ITEM_KEY; + key.offset = (u64)-1; + /* Iterate through all subvolumes except fs tree. */ + while (true) { + struct btrfs_key found_key; + struct extent_buffer *leaf; + int slot; + + /* No more subvolume. */ + if (key.objectid < BTRFS_FIRST_FREE_OBJECTID) { + ret = 0; + break; + } + ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0); + if (ret < 0) { + errno = -ret; + error_msg(ERROR_MSG_READ, "iterate subvolumes: %m"); + btrfs_abort_transaction(trans, ret); + return ret; + } + if (ret > 0) { + ret = btrfs_previous_item(tree_root, &path, + BTRFS_FIRST_FREE_OBJECTID, + BTRFS_ROOT_ITEM_KEY); + if (ret < 0) { + errno = -ret; + btrfs_release_path(&path); + error_msg(ERROR_MSG_READ, "iterate subvolumes: %m"); + btrfs_abort_transaction(trans, ret); + return ret; + } + /* No more subvolume. */ + if (ret > 0) { + ret = 0; + btrfs_release_path(&path); + break; + } + } + leaf = path.nodes[0]; + slot = path.slots[0]; + btrfs_item_key_to_cpu(leaf, &found_key, slot); + btrfs_release_path(&path); + key.objectid = found_key.objectid - 1; + + ret = rescan_subvol_uuid(trans, &found_key); + if (ret < 0) { + errno = -ret; + error("failed to rescan the uuid of subvolume %llu: %m", + found_key.objectid); + btrfs_abort_transaction(trans, ret); + return ret; + } + } + + /* Update fs tree uuid. */ + key.objectid = BTRFS_FS_TREE_OBJECTID; + key.type = BTRFS_ROOT_ITEM_KEY; + key.offset = 0; + ret = rescan_subvol_uuid(trans, &key); + if (ret < 0) { + errno = -ret; + error("failed to rescan the uuid of subvolume %llu: %m", + key.objectid); + btrfs_abort_transaction(trans, ret); + return ret; + } + ret = btrfs_commit_transaction(trans, uuid_root); + if (ret < 0) { + errno = -ret; + error_msg(ERROR_MSG_COMMIT_TRANS, "rescan uuid tree: %m"); + } + return ret; +} + +/* + * Rebuild the whole uuid tree. + * + * If no uuid tree is present, create a new one. + * If there is an existing uuid tree, all items would be deleted first. + * + * For all existing subvolumes (except fs tree), any uninitialized uuid + * (all zero) be generated using a random uuid, and inserted into the new tree. + * And if a subvolume has its UUID initialized, it would not be touched and + * be added to the new uuid tree. + */ +int btrfs_rebuild_uuid_tree(struct btrfs_fs_info *fs_info) +{ + struct btrfs_root *uuid_root; + struct btrfs_key key; + int ret; + + if (!fs_info->uuid_root) { + struct btrfs_trans_handle *trans; + + trans = btrfs_start_transaction(fs_info->tree_root, 1); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + errno = -ret; + error_msg(ERROR_MSG_START_TRANS, "create uuid tree: %m"); + return ret; + } + key.objectid = BTRFS_UUID_TREE_OBJECTID; + key.type = BTRFS_ROOT_ITEM_KEY; + key.offset = 0; + uuid_root = btrfs_create_tree(trans, &key); + if (IS_ERR(uuid_root)) { + ret = PTR_ERR(uuid_root); + errno = -ret; + error("failed to create uuid root: %m"); + btrfs_abort_transaction(trans, ret); + return ret; + } + add_root_to_dirty_list(uuid_root); + fs_info->uuid_root = uuid_root; + ret = btrfs_commit_transaction(trans, fs_info->tree_root); + if (ret < 0) { + errno = -ret; + error_msg(ERROR_MSG_COMMIT_TRANS, "create uuid tree: %m"); + return ret; + } + } + UASSERT(fs_info->uuid_root); + ret = empty_tree(fs_info->uuid_root); + if (ret < 0) { + errno = -ret; + error("failed to clear the existing uuid tree: %m"); + return ret; + } + ret = rescan_uuid_tree(fs_info); + if (ret < 0) { + errno = -ret; + error("failed to rescan the uuid tree: %m"); + return ret; + } + return 0; +} diff --git a/common/root-tree-utils.h b/common/root-tree-utils.h index 0c4ece24c7cc..3cb508022e0c 100644 --- a/common/root-tree-utils.h +++ b/common/root-tree-utils.h @@ -26,5 +26,6 @@ int btrfs_link_subvolume(struct btrfs_trans_handle *trans, struct btrfs_root *parent_root, u64 parent_dir, const char *name, int namelen, struct btrfs_root *subvol); +int btrfs_rebuild_uuid_tree(struct btrfs_fs_info *fs_info); #endif diff --git a/convert/main.c b/convert/main.c index 078ef64e41ca..aa253781ee99 100644 --- a/convert/main.c +++ b/convert/main.c @@ -1339,6 +1339,11 @@ static int do_convert(const char *devname, u32 convert_flags, u32 nodesize, goto fail; } + ret = btrfs_rebuild_uuid_tree(image_root->fs_info); + if (ret < 0) { + errno = -ret; + goto fail; + } memset(root->fs_info->super_copy->label, 0, BTRFS_LABEL_SIZE); if (convert_flags & CONVERT_FLAG_COPY_LABEL) { strncpy_null(root->fs_info->super_copy->label, cctx.label, BTRFS_LABEL_SIZE); diff --git a/mkfs/main.c b/mkfs/main.c index b95f1c3372a3..00ccac14a41a 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -736,35 +736,6 @@ static void update_chunk_allocation(struct btrfs_fs_info *fs_info, } } -static int create_uuid_tree(struct btrfs_trans_handle *trans) -{ - struct btrfs_fs_info *fs_info = trans->fs_info; - struct btrfs_root *root; - struct btrfs_key key = { - .objectid = BTRFS_UUID_TREE_OBJECTID, - .type = BTRFS_ROOT_ITEM_KEY, - }; - int ret = 0; - - UASSERT(fs_info->uuid_root == NULL); - root = btrfs_create_tree(trans, &key); - if (IS_ERR(root)) { - ret = PTR_ERR(root); - goto out; - } - - add_root_to_dirty_list(root); - fs_info->uuid_root = root; - ret = btrfs_uuid_tree_add(trans, fs_info->fs_root->root_item.uuid, - BTRFS_UUID_KEY_SUBVOL, - fs_info->fs_root->root_key.objectid); - if (ret < 0) - btrfs_abort_transaction(trans, ret); - -out: - return ret; -} - static int create_global_root(struct btrfs_trans_handle *trans, u64 objectid, int root_id) { @@ -1822,17 +1793,15 @@ raid_groups: goto out; } - ret = create_uuid_tree(trans); - if (ret) - warning( - "unable to create uuid tree, will be created after mount: %d", ret); - ret = btrfs_commit_transaction(trans, root); if (ret) { errno = -ret; error_msg(ERROR_MSG_START_TRANS, "%m"); goto out; } + ret = btrfs_rebuild_uuid_tree(fs_info); + if (ret < 0) + goto out; ret = cleanup_temp_chunks(fs_info, &allocation, data_profile, metadata_profile, metadata_profile);