diff options
author | Dongsheng Yang <yangds.fnst@cn.fujitsu.com> | 2015-01-18 10:59:23 -0500 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-04-13 10:52:44 -0400 |
commit | 4087cf24ae2af17f7dd9fd34e22fde816952d421 (patch) | |
tree | eeb762c7d9e02e8654b322de316b82857283a900 /fs | |
parent | 03477d945f13a284d35a757b2c2323d165d5cd81 (diff) |
Btrfs: qgroup: cleanup, remove an unsued parameter in btrfs_create_qgroup().
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/ioctl.c | 3 | ||||
-rw-r--r-- | fs/btrfs/qgroup.c | 2 | ||||
-rw-r--r-- | fs/btrfs/qgroup.h | 3 | ||||
-rw-r--r-- | fs/btrfs/tests/qgroup-tests.c | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index ca0736ce25a0..2e66d8e76f32 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -4679,8 +4679,7 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg) | |||
4679 | 4679 | ||
4680 | /* FIXME: check if the IDs really exist */ | 4680 | /* FIXME: check if the IDs really exist */ |
4681 | if (sa->create) { | 4681 | if (sa->create) { |
4682 | ret = btrfs_create_qgroup(trans, root->fs_info, sa->qgroupid, | 4682 | ret = btrfs_create_qgroup(trans, root->fs_info, sa->qgroupid); |
4683 | NULL); | ||
4684 | } else { | 4683 | } else { |
4685 | ret = btrfs_remove_qgroup(trans, root->fs_info, sa->qgroupid); | 4684 | ret = btrfs_remove_qgroup(trans, root->fs_info, sa->qgroupid); |
4686 | } | 4685 | } |
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 5c2aaccbe3da..de321c90130c 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
@@ -1094,7 +1094,7 @@ out: | |||
1094 | } | 1094 | } |
1095 | 1095 | ||
1096 | int btrfs_create_qgroup(struct btrfs_trans_handle *trans, | 1096 | int btrfs_create_qgroup(struct btrfs_trans_handle *trans, |
1097 | struct btrfs_fs_info *fs_info, u64 qgroupid, char *name) | 1097 | struct btrfs_fs_info *fs_info, u64 qgroupid) |
1098 | { | 1098 | { |
1099 | struct btrfs_root *quota_root; | 1099 | struct btrfs_root *quota_root; |
1100 | struct btrfs_qgroup *qgroup; | 1100 | struct btrfs_qgroup *qgroup; |
diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h index 18cc68ca3090..c5242aa9a4b2 100644 --- a/fs/btrfs/qgroup.h +++ b/fs/btrfs/qgroup.h | |||
@@ -70,8 +70,7 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, | |||
70 | int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, | 70 | int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, |
71 | struct btrfs_fs_info *fs_info, u64 src, u64 dst); | 71 | struct btrfs_fs_info *fs_info, u64 src, u64 dst); |
72 | int btrfs_create_qgroup(struct btrfs_trans_handle *trans, | 72 | int btrfs_create_qgroup(struct btrfs_trans_handle *trans, |
73 | struct btrfs_fs_info *fs_info, u64 qgroupid, | 73 | struct btrfs_fs_info *fs_info, u64 qgroupid); |
74 | char *name); | ||
75 | int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, | 74 | int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, |
76 | struct btrfs_fs_info *fs_info, u64 qgroupid); | 75 | struct btrfs_fs_info *fs_info, u64 qgroupid); |
77 | int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, | 76 | int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, |
diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c index 73f299ebdabb..c32a7ba76bca 100644 --- a/fs/btrfs/tests/qgroup-tests.c +++ b/fs/btrfs/tests/qgroup-tests.c | |||
@@ -232,7 +232,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root) | |||
232 | init_dummy_trans(&trans); | 232 | init_dummy_trans(&trans); |
233 | 233 | ||
234 | test_msg("Qgroup basic add\n"); | 234 | test_msg("Qgroup basic add\n"); |
235 | ret = btrfs_create_qgroup(NULL, fs_info, 5, NULL); | 235 | ret = btrfs_create_qgroup(NULL, fs_info, 5); |
236 | if (ret) { | 236 | if (ret) { |
237 | test_msg("Couldn't create a qgroup %d\n", ret); | 237 | test_msg("Couldn't create a qgroup %d\n", ret); |
238 | return ret; | 238 | return ret; |
@@ -301,7 +301,7 @@ static int test_multiple_refs(struct btrfs_root *root) | |||
301 | test_msg("Qgroup multiple refs test\n"); | 301 | test_msg("Qgroup multiple refs test\n"); |
302 | 302 | ||
303 | /* We have 5 created already from the previous test */ | 303 | /* We have 5 created already from the previous test */ |
304 | ret = btrfs_create_qgroup(NULL, fs_info, 256, NULL); | 304 | ret = btrfs_create_qgroup(NULL, fs_info, 256); |
305 | if (ret) { | 305 | if (ret) { |
306 | test_msg("Couldn't create a qgroup %d\n", ret); | 306 | test_msg("Couldn't create a qgroup %d\n", ret); |
307 | return ret; | 307 | return ret; |