Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6463fe58 authored by Stefan Behrens's avatar Stefan Behrens Committed by Josef Bacik
Browse files

Btrfs: set UUID in root_item for created trees 



It is a rare exception that a new tree is created, like the qgroups
tree. So far these new trees have an all-zero UUID in their root
items. All trees that mkfs.btrfs has created get an UUID during the
first mount when btrfs_read_root_item() rewrites the root_item to
the v2 structure style. These UUID are never used so far, but
anyway, since it is better to have it uniform for all trees, this
commit adds some lines that generate and write an UUID for newly
created trees.

Signed-off-by: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 5fbf83c1

fs/btrfs/disk-io.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/migrate.h>

#include <linux/migrate.h>

#include <linux/ratelimit.h>

#include <linux/ratelimit.h>

#include <linux/uuid.h>

#include <asm/unaligned.h>

#include <asm/unaligned.h>

#include "compat.h"

#include "compat.h"

#include "ctree.h"

#include "ctree.h"
@@ -1280,6 +1281,7 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, 
	struct btrfs_key key;

	struct btrfs_key key;

	int ret = 0;

	int ret = 0;

	u64 bytenr;

	u64 bytenr;

	uuid_le uuid;





	root = btrfs_alloc_root(fs_info);

	root = btrfs_alloc_root(fs_info);

	if (!root)

	if (!root)
@@ -1329,6 +1331,8 @@ struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans, 
	btrfs_set_root_used(&root->root_item, leaf->len);

	btrfs_set_root_used(&root->root_item, leaf->len);

	btrfs_set_root_last_snapshot(&root->root_item, 0);

	btrfs_set_root_last_snapshot(&root->root_item, 0);

	btrfs_set_root_dirid(&root->root_item, 0);

	btrfs_set_root_dirid(&root->root_item, 0);

	uuid_le_gen(&uuid);

	memcpy(root->root_item.uuid, uuid.b, BTRFS_UUID_SIZE);

	root->root_item.drop_level = 0;

	root->root_item.drop_level = 0;





	key.objectid = objectid;

	key.objectid = objectid;