btrfs: Remove fs_info argument from btrfs_uuid_tree_rem

Lu Fengqi · kdave · commit d19577912d57 · 2018-05-30T16:46:53.000+02:00
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: Lu Fengqi &lt;lufq.fnst@cn.fujitsu.com&gt;
Reviewed-by: Nikolay Borisov &lt;nborisov@suse.com&gt;
[ rename the function ]
Signed-off-by: David Sterba &lt;dsterba@suse.com&gt;
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
@@ -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,
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
@@ -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);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
@@ -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) {
diff --git a/fs/btrfs/uuid-tree.c b/fs/btrfs/uuid-tree.c
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -4361,7 +4361,7 @@ int btrfs_delete_subvolume(struct inode dir, struct dentry dentry)`
`4361`	`4361`	`}`
`4362`	`4362`	`}`
`4363`	`4363`
`4364`		`- ret = btrfs_uuid_tree_rem(trans, fs_info, dest->root_item.uuid,`
	`4364`	`+ ret = btrfs_uuid_tree_remove(trans, dest->root_item.uuid,`
`4365`	`4365`	`BTRFS_UUID_KEY_SUBVOL,`
`4366`	`4366`	`dest->root_key.objectid);`
`4367`	`4367`	`if (ret && ret != -ENOENT) {`
`@@ -4370,7 +4370,7 @@ int btrfs_delete_subvolume(struct inode dir, struct dentry dentry)`
`4370`	`4370`	`goto out_end_trans;`
`4371`	`4371`	`}`
`4372`	`4372`	`if (!btrfs_is_empty_uuid(dest->root_item.received_uuid)) {`
`4373`		`- ret = btrfs_uuid_tree_rem(trans, fs_info,`
	`4373`	`+ ret = btrfs_uuid_tree_remove(trans,`
`4374`	`4374`	`dest->root_item.received_uuid,`
`4375`	`4375`	`BTRFS_UUID_KEY_RECEIVED_SUBVOL,`
`4376`	`4376`	`dest->root_key.objectid);`
Original file line number	Diff line number	Diff line change
`@@ -144,10 +144,10 @@ int btrfs_uuid_tree_add(struct btrfs_trans_handle trans, u8 uuid, u8 type,`
`144`	`144`	`return ret;`
`145`	`145`	`}`
`146`	`146`
`147`		`-int btrfs_uuid_tree_rem(struct btrfs_trans_handle *trans,`
`148`		`- struct btrfs_fs_info fs_info, u8 uuid, u8 type,`
	`147`	`+int btrfs_uuid_tree_remove(struct btrfs_trans_handle trans, u8 uuid, u8 type,`
`149`	`148`	`u64 subid)`
`150`	`149`	`{`
	`150`	`+ struct btrfs_fs_info *fs_info = trans->fs_info;`
`151`	`151`	`struct btrfs_root *uuid_root = fs_info->uuid_root;`
`152`	`152`	`int ret;`
`153`	`153`	`struct btrfs_path *path = NULL;`
`@@ -239,7 +239,7 @@ static int btrfs_uuid_iter_rem(struct btrfs_root uuid_root, u8 uuid, u8 type,`
`239`	`239`	`goto out;`
`240`	`240`	`}`
`241`	`241`
`242`		`- ret = btrfs_uuid_tree_rem(trans, uuid_root->fs_info, uuid, type, subid);`
	`242`	`+ ret = btrfs_uuid_tree_remove(trans, uuid, type, subid);`
`243`	`243`	`btrfs_end_transaction(trans);`
`244`	`244`
`245`	`245`	`out:`