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

btrfs: qgroup: Drop fs_info parameter from btrfs_del_qgroup_relation 



It can be fetched from the transaction handle.

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

fs/btrfs/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -5173,8 +5173,7 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg) 
	if (sa->assign) {

		ret = btrfs_add_qgroup_relation(trans, sa->src, sa->dst);

	} else {

		ret = btrfs_del_qgroup_relation(trans, fs_info,

						sa->src, sa->dst);

		ret = btrfs_del_qgroup_relation(trans, sa->src, sa->dst);

	}



	/* update qgroup status and info */

fs/btrfs/qgroup.c

+3 −2
Original line number Diff line number Diff line
@@ -1351,9 +1351,10 @@ static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, 
	return ret;

}



int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,

			      struct btrfs_fs_info *fs_info, u64 src, u64 dst)

int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,

			      u64 dst)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	int ret = 0;



	mutex_lock(&fs_info->qgroup_ioctl_lock);

fs/btrfs/qgroup.h

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info, 
				     bool interruptible);

int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,

			      u64 dst);

int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,

			      struct btrfs_fs_info *fs_info, u64 src, u64 dst);

int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,

			      u64 dst);

int btrfs_create_qgroup(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info, u64 qgroupid);

int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,