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

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

btrfs: Remove fs_info argument from btrfs_uuid_tree_rem 



This function always takes a transaction handle which contains a
reference to the fs_info. Use that and remove the extra argument.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
[ rename the function ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cdb345a8

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -3042,8 +3042,7 @@ void btrfs_update_root_times(struct btrfs_trans_handle *trans, 
/* uuid-tree.c */

int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,

			u64 subid);

int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info, u8 *uuid, u8 type,

int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,

			u64 subid);

int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info,

			    int (*check_func)(struct btrfs_fs_info *, u8 *, u8,

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -4361,7 +4361,7 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) 
		}

	}



	ret = btrfs_uuid_tree_rem(trans, fs_info, dest->root_item.uuid,

	ret = btrfs_uuid_tree_remove(trans, dest->root_item.uuid,

				  BTRFS_UUID_KEY_SUBVOL,

				  dest->root_key.objectid);

	if (ret && ret != -ENOENT) {
@@ -4370,7 +4370,7 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) 
		goto out_end_trans;

	}

	if (!btrfs_is_empty_uuid(dest->root_item.received_uuid)) {

		ret = btrfs_uuid_tree_rem(trans, fs_info,

		ret = btrfs_uuid_tree_remove(trans,

					  dest->root_item.received_uuid,

					  BTRFS_UUID_KEY_RECEIVED_SUBVOL,

					  dest->root_key.objectid);

fs/btrfs/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -5018,8 +5018,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file, 
				       BTRFS_UUID_SIZE);

	if (received_uuid_changed &&

	    !btrfs_is_empty_uuid(root_item->received_uuid)) {

		ret = btrfs_uuid_tree_rem(trans, fs_info,

					  root_item->received_uuid,

		ret = btrfs_uuid_tree_remove(trans, root_item->received_uuid,

					  BTRFS_UUID_KEY_RECEIVED_SUBVOL,

					  root->root_key.objectid);

		if (ret && ret != -ENOENT) {

fs/btrfs/uuid-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -144,10 +144,10 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle *trans, u8 *uuid, u8 type, 
	return ret;

}



int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info, u8 *uuid, u8 type,

int btrfs_uuid_tree_remove(struct btrfs_trans_handle *trans, u8 *uuid, u8 type,

			u64 subid)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *uuid_root = fs_info->uuid_root;

	int ret;

	struct btrfs_path *path = NULL;
@@ -239,7 +239,7 @@ static int btrfs_uuid_iter_rem(struct btrfs_root *uuid_root, u8 *uuid, u8 type, 
		goto out;

	}



	ret = btrfs_uuid_tree_rem(trans, uuid_root->fs_info, uuid, type, subid);

	ret = btrfs_uuid_tree_remove(trans, uuid, type, subid);

	btrfs_end_transaction(trans);



out: