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

Commit 4087cf24 authored by Dongsheng Yang's avatar Dongsheng Yang Committed by Chris Mason
Browse files

Btrfs: qgroup: cleanup, remove an unsued parameter in btrfs_create_qgroup(). 



Signed-off-by: default avatarDongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 03477d94

fs/btrfs/ioctl.c

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


	/* FIXME: check if the IDs really exist */

	if (sa->create) {

		ret = btrfs_create_qgroup(trans, root->fs_info, sa->qgroupid,

					  NULL);

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

	} else {

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

	}

fs/btrfs/qgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, 
}



int btrfs_create_qgroup(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info, u64 qgroupid, char *name)

			struct btrfs_fs_info *fs_info, u64 qgroupid)

{

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *qgroup;

fs/btrfs/qgroup.h

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

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

int btrfs_create_qgroup(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info, u64 qgroupid,

			char *name);

			struct btrfs_fs_info *fs_info, u64 qgroupid);

int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,

			      struct btrfs_fs_info *fs_info, u64 qgroupid);

int btrfs_limit_qgroup(struct btrfs_trans_handle *trans,

fs/btrfs/tests/qgroup-tests.c

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root) 
	init_dummy_trans(&trans);



	test_msg("Qgroup basic add\n");

	ret = btrfs_create_qgroup(NULL, fs_info, 5, NULL);

	ret = btrfs_create_qgroup(NULL, fs_info, 5);

	if (ret) {

		test_msg("Couldn't create a qgroup %d\n", ret);

		return ret;
@@ -301,7 +301,7 @@ static int test_multiple_refs(struct btrfs_root *root) 
	test_msg("Qgroup multiple refs test\n");



	/* We have 5 created already from the previous test */

	ret = btrfs_create_qgroup(NULL, fs_info, 256, NULL);

	ret = btrfs_create_qgroup(NULL, fs_info, 256);

	if (ret) {

		test_msg("Couldn't create a qgroup %d\n", ret);

		return ret;