Commit de37aa51 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fsid/metadata_fsid fields from btrfs_info 



Currently btrfs_fs_info structure contains a copy of the
fsid/metadata_uuid fields. Same values are also contained in the
btrfs_fs_devices structure which fs_info has a reference to. Let's
reduce duplication by removing the fields from fs_info and always refer
to the ones in fs_devices. No functional changes.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 56f20f40

fs/btrfs/check-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -1720,7 +1720,7 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state, 
	num_pages = state->metablock_size >> PAGE_SHIFT;

	h = (struct btrfs_header *)datav[0];



	if (memcmp(h->fsid, fs_info->fsid, BTRFS_FSID_SIZE))

	if (memcmp(h->fsid, fs_info->fs_devices->fsid, BTRFS_FSID_SIZE))

		return 1;



	for (i = 0; i < num_pages; i++) {

fs/btrfs/ctree.c

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "transaction.h"

#include "print-tree.h"

#include "locking.h"

#include "volumes.h"



static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root

		      *root, struct btrfs_path *path, int level);
@@ -224,7 +225,7 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans, 
	else

		btrfs_set_header_owner(cow, new_root_objectid);



	write_extent_buffer_fsid(cow, fs_info->metadata_fsid);

	write_extent_buffer_fsid(cow, fs_info->fs_devices->metadata_uuid);



	WARN_ON(btrfs_header_generation(buf) > trans->transid);

	if (new_root_objectid == BTRFS_TREE_RELOC_OBJECTID)
@@ -1050,7 +1051,7 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, 
	else

		btrfs_set_header_owner(cow, root->root_key.objectid);



	write_extent_buffer_fsid(cow, fs_info->metadata_fsid);

	write_extent_buffer_fsid(cow, fs_info->fs_devices->metadata_uuid);



	ret = update_ref_for_cow(trans, root, buf, cow, &last_ref);

	if (ret) {

fs/btrfs/ctree.h

+0 −4
Original line number Diff line number Diff line
@@ -773,10 +773,6 @@ bool btrfs_pinned_by_swapfile(struct btrfs_fs_info *fs_info, void *ptr); 
#define BTRFS_FS_BALANCE_RUNNING		18



struct btrfs_fs_info {

	/* User-visible fs UUID */

	u8 fsid[BTRFS_FSID_SIZE];

	/* UUID written to btree blocks */

	u8 metadata_fsid[BTRFS_FSID_SIZE];

	u8 chunk_tree_uuid[BTRFS_UUID_SIZE];

	unsigned long flags;

	struct btrfs_root *extent_root;

fs/btrfs/disk-io.c

+11 −9
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static int csum_dirty_buffer(struct btrfs_fs_info *fs_info, struct page *page) 
	if (WARN_ON(!PageUptodate(page)))

		return -EUCLEAN;



	ASSERT(memcmp_extent_buffer(eb, fs_info->metadata_fsid,

	ASSERT(memcmp_extent_buffer(eb, fs_info->fs_devices->metadata_uuid,

			btrfs_header_fsid(), BTRFS_FSID_SIZE) == 0);



	return csum_tree_block(fs_info, eb, 0);
@@ -2456,11 +2456,11 @@ static int validate_super(struct btrfs_fs_info *fs_info, 
		ret = -EINVAL;

	}



	if (memcmp(fs_info->metadata_fsid, sb->dev_item.fsid,

	if (memcmp(fs_info->fs_devices->metadata_uuid, sb->dev_item.fsid,

		   BTRFS_FSID_SIZE) != 0) {

		btrfs_err(fs_info,

			"dev_item UUID does not match metadata fsid: %pU != %pU",

			fs_info->metadata_fsid, sb->dev_item.fsid);

			fs_info->fs_devices->metadata_uuid, sb->dev_item.fsid);

		ret = -EINVAL;

	}
@@ -2803,14 +2803,16 @@ int open_ctree(struct super_block *sb, 
	       sizeof(*fs_info->super_for_commit));

	brelse(bh);



	memcpy(fs_info->fsid, fs_info->super_copy->fsid, BTRFS_FSID_SIZE);

	ASSERT(!memcmp(fs_info->fs_devices->fsid, fs_info->super_copy->fsid,

		       BTRFS_FSID_SIZE));



	if (btrfs_fs_incompat(fs_info, METADATA_UUID)) {

		memcpy(fs_info->metadata_fsid,

		       fs_info->super_copy->metadata_uuid, BTRFS_FSID_SIZE);

	} else {

		memcpy(fs_info->metadata_fsid, fs_info->fsid, BTRFS_FSID_SIZE);

		ASSERT(!memcmp(fs_info->fs_devices->metadata_uuid,

				fs_info->super_copy->metadata_uuid,

				BTRFS_FSID_SIZE));

	}





	ret = btrfs_validate_mount_super(fs_info);

	if (ret) {

		btrfs_err(fs_info, "superblock contains fatal errors");
@@ -2930,7 +2932,7 @@ int open_ctree(struct super_block *sb, 


	sb->s_blocksize = sectorsize;

	sb->s_blocksize_bits = blksize_bits(sectorsize);

	memcpy(&sb->s_uuid, fs_info->fsid, BTRFS_FSID_SIZE);

	memcpy(&sb->s_uuid, fs_info->fs_devices->fsid, BTRFS_FSID_SIZE);



	mutex_lock(&fs_info->chunk_mutex);

	ret = btrfs_read_sys_array(fs_info);

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -8312,7 +8312,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
	btrfs_set_header_generation(buf, trans->transid);

	btrfs_set_header_backref_rev(buf, BTRFS_MIXED_BACKREF_REV);

	btrfs_set_header_owner(buf, owner);

	write_extent_buffer_fsid(buf, fs_info->metadata_fsid);

	write_extent_buffer_fsid(buf, fs_info->fs_devices->metadata_uuid);

	write_extent_buffer_chunk_tree_uuid(buf, fs_info->chunk_tree_uuid);

	if (root->root_key.objectid == BTRFS_TREE_LOG_OBJECTID) {

		buf->log_index = root->log_transid % 2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE