| Message ID | 1433314653-548-2-git-send-email-yangds.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 2015/06/03 15:57, Dongsheng Yang wrote: > Currently, we can only set a limitation on a qgroup, but we > can not clear it. > > This patch provide a choice to user to clear a limitation on > qgroup by passing a value of CLEAR_VALUE(-1) to kernel. > > Reported-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> > Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> Tested-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> > --- > fs/btrfs/qgroup.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 41 insertions(+), 8 deletions(-) > > diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c > index 3d65465..0412d5b 100644 > --- a/fs/btrfs/qgroup.c > +++ b/fs/btrfs/qgroup.c > @@ -1317,6 +1317,11 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, > struct btrfs_root *quota_root; > struct btrfs_qgroup *qgroup; > int ret = 0; > + /* Sometimes we would want to clear the limit on this qgroup. > + * To meet this requirement, we treat the -1 as a special value > + * which tell kernel to clear the limit on this qgroup. > + */ > + const u64 CLEAR_VALUE = -1; > > mutex_lock(&fs_info->qgroup_ioctl_lock); > quota_root = fs_info->quota_root; > @@ -1332,14 +1337,42 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, > } > > spin_lock(&fs_info->qgroup_lock); > - if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_RFER) > - qgroup->max_rfer = limit->max_rfer; > - if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) > - qgroup->max_excl = limit->max_excl; > - if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_RFER) > - qgroup->rsv_rfer = limit->rsv_rfer; > - if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_EXCL) > - qgroup->rsv_excl = limit->rsv_excl; > + if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_RFER) { > + if (limit->max_rfer == CLEAR_VALUE) { > + qgroup->lim_flags &= ~BTRFS_QGROUP_LIMIT_MAX_RFER; > + limit->flags &= ~BTRFS_QGROUP_LIMIT_MAX_RFER; > + qgroup->max_rfer = 0; > + } else { > + qgroup->max_rfer = limit->max_rfer; > + } > + } > + if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) { > + if (limit->max_excl == CLEAR_VALUE) { > + qgroup->lim_flags &= ~BTRFS_QGROUP_LIMIT_MAX_EXCL; > + limit->flags &= ~BTRFS_QGROUP_LIMIT_MAX_EXCL; > + qgroup->max_excl = 0; > + } else { > + qgroup->max_excl = limit->max_excl; > + } > + } > + if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_RFER) { > + if (limit->rsv_rfer == CLEAR_VALUE) { > + qgroup->lim_flags &= ~BTRFS_QGROUP_LIMIT_RSV_RFER; > + limit->flags &= ~BTRFS_QGROUP_LIMIT_RSV_RFER; > + qgroup->rsv_rfer = 0; > + } else { > + qgroup->rsv_rfer = limit->rsv_rfer; > + } > + } > + if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_EXCL) { > + if (limit->rsv_excl == CLEAR_VALUE) { > + qgroup->lim_flags &= ~BTRFS_QGROUP_LIMIT_RSV_EXCL; > + limit->flags &= ~BTRFS_QGROUP_LIMIT_RSV_EXCL; > + qgroup->rsv_excl = 0; > + } else { > + qgroup->rsv_excl = limit->rsv_excl; > + } > + } > qgroup->lim_flags |= limit->flags; > > spin_unlock(&fs_info->qgroup_lock); > -- 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/qgroup.c b/fs/btrfs/qgroup.c index 3d65465..0412d5b 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1317,6 +1317,11 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, struct btrfs_root *quota_root; struct btrfs_qgroup *qgroup; int ret = 0; + /* Sometimes we would want to clear the limit on this qgroup. + * To meet this requirement, we treat the -1 as a special value + * which tell kernel to clear the limit on this qgroup. + */ + const u64 CLEAR_VALUE = -1; mutex_lock(&fs_info->qgroup_ioctl_lock); quota_root = fs_info->quota_root; @@ -1332,14 +1337,42 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, } spin_lock(&fs_info->qgroup_lock); - if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_RFER) - qgroup->max_rfer = limit->max_rfer; - if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) - qgroup->max_excl = limit->max_excl; - if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_RFER) - qgroup->rsv_rfer = limit->rsv_rfer; - if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_EXCL) - qgroup->rsv_excl = limit->rsv_excl; + if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_RFER) { + if (limit->max_rfer == CLEAR_VALUE) { + qgroup->lim_flags &= ~BTRFS_QGROUP_LIMIT_MAX_RFER; + limit->flags &= ~BTRFS_QGROUP_LIMIT_MAX_RFER; + qgroup->max_rfer = 0; + } else { + qgroup->max_rfer = limit->max_rfer; + } + } + if (limit->flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) { + if (limit->max_excl == CLEAR_VALUE) { + qgroup->lim_flags &= ~BTRFS_QGROUP_LIMIT_MAX_EXCL; + limit->flags &= ~BTRFS_QGROUP_LIMIT_MAX_EXCL; + qgroup->max_excl = 0; + } else { + qgroup->max_excl = limit->max_excl; + } + } + if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_RFER) { + if (limit->rsv_rfer == CLEAR_VALUE) { + qgroup->lim_flags &= ~BTRFS_QGROUP_LIMIT_RSV_RFER; + limit->flags &= ~BTRFS_QGROUP_LIMIT_RSV_RFER; + qgroup->rsv_rfer = 0; + } else { + qgroup->rsv_rfer = limit->rsv_rfer; + } + } + if (limit->flags & BTRFS_QGROUP_LIMIT_RSV_EXCL) { + if (limit->rsv_excl == CLEAR_VALUE) { + qgroup->lim_flags &= ~BTRFS_QGROUP_LIMIT_RSV_EXCL; + limit->flags &= ~BTRFS_QGROUP_LIMIT_RSV_EXCL; + qgroup->rsv_excl = 0; + } else { + qgroup->rsv_excl = limit->rsv_excl; + } + } qgroup->lim_flags |= limit->flags; spin_unlock(&fs_info->qgroup_lock);
Currently, we can only set a limitation on a qgroup, but we can not clear it. This patch provide a choice to user to clear a limitation on qgroup by passing a value of CLEAR_VALUE(-1) to kernel. Reported-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com> --- fs/btrfs/qgroup.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-)