| Message ID | 1364468087-1702-4-git-send-email-wangshilong1991@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Mar 28, 2013 at 04:54:46AM -0600, Wang Shilong wrote: > From: Wang Shilong <wangsl-fnst@cn.fujitsu.com> > > If the specified qgroup relation dosen't exist, removing qgroup operations > will return -ENOENT; > > If the specified qgroup relation exists, assigning qgroup relations will > return -EEXIST. > > Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com> > Reviewed-by: Miao Xie <miaox@cn.fujitsu.com> Fails to compile with fs/btrfs/ioctl.c: In function ‘btrfs_ioctl_qgroup_assign’: fs/btrfs/ioctl.c:3771:2: error: implicit declaration of function ‘btrfs_may_assign_qgroup’ [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors Please fix and resubmit. Thanks, Josef -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello, > On Thu, Mar 28, 2013 at 04:54:46AM -0600, Wang Shilong wrote: >> From: Wang Shilong <wangsl-fnst@cn.fujitsu.com> >> >> If the specified qgroup relation dosen't exist, removing qgroup operations >> will return -ENOENT; >> >> If the specified qgroup relation exists, assigning qgroup relations will >> return -EEXIST. >> >> Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com> >> Reviewed-by: Miao Xie <miaox@cn.fujitsu.com> > > Fails to compile with > > fs/btrfs/ioctl.c: In function ‘btrfs_ioctl_qgroup_assign’: > fs/btrfs/ioctl.c:3771:2: error: implicit declaration of function > ‘btrfs_may_assign_qgroup’ [-Werror=implicit-function-declaration] > cc1: some warnings being treated as errors > > Please fix and resubmit. Thanks, Sorry for such stupid errors, i promise that i have compile and test patch-set. Things go like this, because when i compile kernel with patch-set , this errors happen, i just fix it but don't update commit. However, when i pass the test, i forget the compile errors….. Next time, i will take care of that… Thanks very much for your testing! Thanks, Wang > > Josef -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 9e4ccb3..1ca1c63 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3827,6 +3827,8 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans, int btrfs_quota_disable(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info); int btrfs_quota_rescan(struct btrfs_fs_info *fs_info); +int btrfs_may_assign_relation(struct btrfs_root *root, + struct btrfs_ioctl_qgroup_assign_args *sa); int btrfs_add_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, diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index f66d622..701d812 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3758,13 +3758,15 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg) } mutex_lock(&root->fs_info->quota_lock); + ret = btrfs_may_assign_qgroup(root, sa); + if (ret) + goto out; trans = btrfs_join_transaction(root); if (IS_ERR(trans)) { ret = PTR_ERR(trans); goto out; } - /* FIXME: check if the IDs really exist */ if (sa->assign) { ret = btrfs_add_qgroup_relation(trans, root->fs_info, sa->src, sa->dst); diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 6f57a98..0e09ac6 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -952,13 +952,9 @@ int btrfs_quota_rescan(struct btrfs_fs_info *fs_info) int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, u64 src, u64 dst) { - struct btrfs_root *quota_root; + struct btrfs_root *quota_root = fs_info->quota_root; int ret = 0; - quota_root = fs_info->quota_root; - if (!quota_root) - return -EINVAL; - ret = add_qgroup_relation_item(trans, quota_root, src, dst); if (ret) return ret; @@ -979,14 +975,10 @@ 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) { - struct btrfs_root *quota_root; + struct btrfs_root *quota_root = fs_info->quota_root; int ret = 0; int err; - quota_root = fs_info->quota_root; - if (!quota_root) - return -EINVAL; - ret = del_qgroup_relation_item(trans, quota_root, src, dst); err = del_qgroup_relation_item(trans, quota_root, dst, src); if (err && !ret) @@ -1681,3 +1673,31 @@ int btrfs_may_create_qgroup(struct btrfs_root *root, return -EBUSY; return 0; } + +int btrfs_may_assign_qgroup(struct btrfs_root *root, + struct btrfs_ioctl_qgroup_assign_args *sa) +{ + + struct btrfs_qgroup *parent = NULL; + struct btrfs_qgroup *member = NULL; + struct btrfs_qgroup_list *list; + + if (!root->fs_info->quota_root) + return -EINVAL; + + member = find_qgroup_rb(root->fs_info, sa->src); + parent = find_qgroup_rb(root->fs_info, sa->dst); + if (!member || !parent) + return -ENOENT; + + list_for_each_entry(list, &member->groups, next_group) { + if (list->group == parent) { + if (sa->assign) + return -EEXIST; + return 0; + } + } + if (sa->assign) + return 0; + return -ENOENT; +}