Skip to content

Fix incorrectly created uuid tree

Qu Wenruo linux-btrfs 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 1 replyIn review
  2. v13 patches 12 repliesSuperseded

Changes in v2 from the cover letter

- Don't use btrfs_copy_root() to create empty root. Instead, use btrfs_create_tree() to create an empty tree and fill it from scratch.
- Rename functions:
create_inode_root() -> create_data_reloc_root()
- Better patch order

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5btrfs-progs: Export btrfs_create_tree() and move it to disk-io.cdisk-io.c disk-io.h free-space-tree.c+75 -730 replies
2/5btrfs-progs: mkfs: Create data reloc tree from scratchdisk-io.c disk-io.h mkfs/main.c+71 -30 replies
3/5btrfs-progs: uuid: Port kernel btrfs_uuid_tree_lookup()uuid-tree.c+71 -20 replies
4/5btrfs-progs: uuid: Port btrfs_uuid_tree_add() functionctree.h disk-io.c uuid-tree.c+89 -20 replies
5/5btrfs-progs: Create uuid tree with proper contentsmkfs/main.c+28 -330 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/5] Fix incorrectly created uuid tree

This patchset can be fetched from github:
https://github.com/adam900710/btrfs-progs/tree/uuid_tree_support
Which is based on v4.19.1 tag.

Commit 2a496a5b8b74 ("btrfs-progs: mkfs: precreate the uuid tree") creates uuid tree at mkfs time.

However it doesn't populate uuid tree correctly nor just create an empty root.
It uses create_tree(), which just copies the content of fs root, containing meaningless INODE_ITEM:

v4.15 mkfs (no uuid tree creation) + kernel mount:
uuid tree key (UUID_TREE ROOT_ITEM 0)
leaf 30572544 items 1 free space 16250 generation 7 owner UUID_TREE leaf 30572544 flags 0x1(WRITTEN) backref revision 1
fs uuid 33ecddef-fc86-481a-93ce-846b01c11376
chunk uuid 9e58f646-b0da-43ca-9c7d-8bbe3e120246

	item 0 key (0x92457c59d31491be UUID_KEY_SUBVOL 0xef908b5e79aa76a1) itemoff 16275 itemsize 8
		subvol_id 5

v4.19.1 mkfs (incorrect one), no kernel mount:
uuid tree key (UUID_TREE ROOT_ITEM 0)
leaf 30507008 items 2 free space 16061 generation 4 owner UUID_TREE leaf 30507008 flags 0x1(WRITTEN) backref revision 1
fs uuid 162f5333-9b5d-4217-877c-ddaeaa79398e
chunk uuid 7bc2c5c6-a6d2-4eec-a513-142b549c6541

	item 0 key (256 INODE_ITEM 0) itemoff 16123 itemsize 160
		generation 3 transid 0 size 0 nbytes 16384
		block group 0 mode 40755 links 1 uid 0 gid 0 rdev 0
		sequence 0 flags 0x0(none)
	item 1 key (256 INODE_REF 256) itemoff 16111 itemsize 12
		index 0 namelen 2 name: ..

This patchset will fix it by populuating uuid tree properly, as kernel tree checker now doesn't accept empty uuid tree.

w/ this patchset, no kernel mount:
uuid tree key (UUID_TREE ROOT_ITEM 0)
leaf 30507008 items 1 free space 16250 generation 4 owner UUID_TREE leaf 30507008 flags 0x1(WRITTEN) backref revision 1
fs uuid ae53079e-dbbc-409b-a565-5326c7b27731
chunk uuid b5fb1bea-f20d-4af1-80f8-6ca3f0038d67

	item 0 key (0x334ba6b032d89c07 UUID_KEY_SUBVOL 0x86cde09cb78bcca0) itemoff 16275 itemsize 8
		subvol_id 5

changelog:
v2:
- Don't use btrfs_copy_root() to create empty root. Instead, use btrfs_create_tree() to create an empty tree and fill it from scratch.
- Rename functions:
create_inode_root() -> create_data_reloc_root()
- Better patch order

Qu Wenruo (5):
btrfs-progs: Export btrfs_create_tree() and move it to disk-io.c
btrfs-progs: mkfs: Create data reloc tree from scratch
btrfs-progs: uuid: Port kernel btrfs_uuid_tree_lookup()
btrfs-progs: uuid: Port btrfs_uuid_tree_add() function
btrfs-progs: Create uuid tree with proper contents

 ctree.h           |   7 ++-
 disk-io.c         |  94 ++++++++++++++++++++++++++++++-
 disk-io.h         |   5 +-
 free-space-tree.c |  72 ------------------------
 mkfs/main.c       | 131 +++++++++++++++++++++++++++++++------------
 uuid-tree.c       | 138 +++++++++++++++++++++++++++++++++++++++++++++-
 6 files changed, 334 insertions(+), 113 deletions(-)
Signature · 1 line
2.20.1