Commit 6025c19f authored by Lu Fengqi's avatar Lu Fengqi Committed by David Sterba
Browse files

btrfs: Remove fs_info from btrfs_add_root_ref 



It can be referenced from the passed transaction handle.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3ee1c553

fs/btrfs/ctree.h

+3 −4
Original line number Diff line number Diff line
@@ -2984,10 +2984,9 @@ void btrfs_put_tree_mod_seq(struct btrfs_fs_info *fs_info, 
int btrfs_old_root_level(struct btrfs_root *root, u64 time_seq);



/* root-item.c */

int btrfs_add_root_ref(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info,

		       u64 root_id, u64 ref_id, u64 dirid, u64 sequence,

		       const char *name, int name_len);

int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id,

		       u64 ref_id, u64 dirid, u64 sequence, const char *name,

		       int name_len);

int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,

		       u64 ref_id, u64 dirid, u64 *sequence, const char *name,

		       int name_len);

fs/btrfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -6385,7 +6385,6 @@ int btrfs_add_link(struct btrfs_trans_handle *trans, 
		   struct btrfs_inode *parent_inode, struct btrfs_inode *inode,

		   const char *name, int name_len, int add_backref, u64 index)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	int ret = 0;

	struct btrfs_key key;

	struct btrfs_root *root = parent_inode->root;
@@ -6401,7 +6400,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans, 
	}



	if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) {

		ret = btrfs_add_root_ref(trans, fs_info, key.objectid,

		ret = btrfs_add_root_ref(trans, key.objectid,

					 root->root_key.objectid, parent_ino,

					 index, name, name_len);

	} else if (add_backref) {

fs/btrfs/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -698,8 +698,7 @@ static noinline int create_subvol(struct inode *dir, 
	ret = btrfs_update_inode(trans, root, dir);

	BUG_ON(ret);



	ret = btrfs_add_root_ref(trans, fs_info,

				 objectid, root->root_key.objectid,

	ret = btrfs_add_root_ref(trans, objectid, root->root_key.objectid,

				 btrfs_ino(BTRFS_I(dir)), index, name, namelen);

	BUG_ON(ret);

fs/btrfs/root-tree.c

+4 −5
Original line number Diff line number Diff line
@@ -412,12 +412,11 @@ out: 
 *

 * Will return 0, -ENOMEM, or anything from the CoW path

 */

int btrfs_add_root_ref(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info,

		       u64 root_id, u64 ref_id, u64 dirid, u64 sequence,

		       const char *name, int name_len)

int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id,

		       u64 ref_id, u64 dirid, u64 sequence, const char *name,

		       int name_len)

{

	struct btrfs_root *tree_root = fs_info->tree_root;

	struct btrfs_root *tree_root = trans->fs_info->tree_root;

	struct btrfs_key key;

	int ret;

	struct btrfs_path *path;

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1573,7 +1573,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 
	/*

	 * insert root back/forward references

	 */

	ret = btrfs_add_root_ref(trans, fs_info, objectid,

	ret = btrfs_add_root_ref(trans, objectid,

				 parent_root->root_key.objectid,

				 btrfs_ino(BTRFS_I(parent_inode)), index,

				 dentry->d_name.name, dentry->d_name.len);

CRA Git | Maintained and supported by SUSTech CRA and CCSE