Commit 4fd786e6 authored by Misono Tomohiro's avatar Misono Tomohiro Committed by David Sterba
Browse files

btrfs: Remove 'objectid' member from struct btrfs_root 



There are two members in struct btrfs_root which indicate root's
objectid: objectid and root_key.objectid.

They are both set to the same value in __setup_root():

  static void __setup_root(struct btrfs_root *root,
                           struct btrfs_fs_info *fs_info,
                           u64 objectid)
  {
    ...
    root->objectid = objectid;
    ...
    root->root_key.objectid = objecitd;
    ...
  }

and not changed to other value after initialization.

grep in btrfs directory shows both are used in many places:
  $ grep -rI "root->root_key.objectid" | wc -l
  133
  $ grep -rI "root->objectid" | wc -l
  55
 (4.17, inc. some noise)

It is confusing to have two similar variable names and it seems
that there is no rule about which should be used in a certain case.

Since ->root_key itself is needed for tree reloc tree, let's remove
'objecitd' member and unify code to use ->root_key.objectid in all places.

Signed-off-by: default avatarMisono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5a2cb25a

fs/btrfs/backref.c

+3 −2
Original line number Diff line number Diff line
@@ -1468,7 +1468,7 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr) 
	struct seq_list elem = SEQ_LIST_INIT(elem);

	int ret = 0;

	struct share_check shared = {

		.root_objectid = root->objectid,

		.root_objectid = root->root_key.objectid,

		.inum = inum,

		.share_count = 0,

	};
@@ -2031,7 +2031,8 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root, 
			/* path must be released before calling iterate()! */

			btrfs_debug(fs_root->fs_info,

				"following ref at offset %u for inode %llu in tree %llu",

				cur, found_key.objectid, fs_root->objectid);

				cur, found_key.objectid,

				fs_root->root_key.objectid);

			ret = iterate(parent, name_len,

				      (unsigned long)(iref + 1), eb, ctx);

			if (ret)

fs/btrfs/btrfs_inode.h

+4 −4
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static inline struct btrfs_inode *BTRFS_I(const struct inode *inode) 
static inline unsigned long btrfs_inode_hash(u64 objectid,

					     const struct btrfs_root *root)

{

	u64 h = objectid ^ (root->objectid * GOLDEN_RATIO_PRIME);

	u64 h = objectid ^ (root->root_key.objectid * GOLDEN_RATIO_PRIME);



#if BITS_PER_LONG == 32

	h = (h >> 32) ^ (h & 0xffffffff);
@@ -339,15 +339,15 @@ static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode, 
	struct btrfs_root *root = inode->root;



	/* Output minus objectid, which is more meaningful */

	if (root->objectid >= BTRFS_LAST_FREE_OBJECTID)

	if (root->root_key.objectid >= BTRFS_LAST_FREE_OBJECTID)

		btrfs_warn_rl(root->fs_info,

	"csum failed root %lld ino %lld off %llu csum 0x%08x expected csum 0x%08x mirror %d",

			root->objectid, btrfs_ino(inode),

			root->root_key.objectid, btrfs_ino(inode),

			logical_start, csum, csum_expected, mirror_num);

	else

		btrfs_warn_rl(root->fs_info,

	"csum failed root %llu ino %llu off %llu csum 0x%08x expected csum 0x%08x mirror %d",

			root->objectid, btrfs_ino(inode),

			root->root_key.objectid, btrfs_ino(inode),

			logical_start, csum, csum_expected, mirror_num);

}

fs/btrfs/ctree.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static void add_root_to_dirty_list(struct btrfs_root *root) 
	spin_lock(&fs_info->trans_lock);

	if (!test_and_set_bit(BTRFS_ROOT_DIRTY, &root->state)) {

		/* Want the extent tree to be the last on the list */

		if (root->objectid == BTRFS_EXTENT_TREE_OBJECTID)

		if (root->root_key.objectid == BTRFS_EXTENT_TREE_OBJECTID)

			list_move_tail(&root->dirty_list,

				       &fs_info->dirty_cowonly_roots);

		else

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -1202,7 +1202,6 @@ struct btrfs_root { 
	int last_log_commit;

	pid_t log_start_pid;



	u64 objectid;

	u64 last_trans;



	u32 type;

fs/btrfs/delayed-inode.c

+3 −2
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
	if (unlikely(ret)) {

		btrfs_err(trans->fs_info,

			  "err add delayed dir index item(name: %.*s) into the insertion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)",

			  name_len, name, delayed_node->root->objectid,

			  name_len, name, delayed_node->root->root_key.objectid,

			  delayed_node->inode_id, ret);

		BUG();

	}
@@ -1533,7 +1533,8 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
	if (unlikely(ret)) {

		btrfs_err(trans->fs_info,

			  "err add delayed dir index item(index: %llu) into the deletion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)",

			  index, node->root->objectid, node->inode_id, ret);

			  index, node->root->root_key.objectid,

			  node->inode_id, ret);

		BUG();

	}

	mutex_unlock(&node->mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE