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

btrfs: qgroup: Drop fs_info parameter from btrfs_remove_qgroup 



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 49a05ecd

fs/btrfs/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -5195,7 +5195,6 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg) 
static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg)

{

	struct inode *inode = file_inode(file);

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_ioctl_qgroup_create_args *sa;

	struct btrfs_trans_handle *trans;
@@ -5229,7 +5228,7 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg) 
	if (sa->create) {

		ret = btrfs_create_qgroup(trans, sa->qgroupid);

	} else {

		ret = btrfs_remove_qgroup(trans, fs_info, sa->qgroupid);

		ret = btrfs_remove_qgroup(trans, sa->qgroupid);

	}



	err = btrfs_end_transaction(trans);

fs/btrfs/qgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -1398,9 +1398,9 @@ int btrfs_create_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) 
	return ret;

}



int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info, u64 qgroupid)

int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *qgroup;

	struct btrfs_qgroup_list *list;

fs/btrfs/qgroup.h

+1 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, 
int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,

			      u64 dst);

int btrfs_create_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid);

int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,

			      struct btrfs_fs_info *fs_info, u64 qgroupid);

int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid);

int btrfs_limit_qgroup(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info, u64 qgroupid,

		       struct btrfs_qgroup_limit *limit);