diff options
| author | Dongsheng Yang <yangds.fnst@cn.fujitsu.com> | 2015-02-06 11:06:25 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-04-13 07:52:43 -0700 |
| commit | 03477d945f13a284d35a757b2c2323d165d5cd81 (patch) | |
| tree | 7befa6fb9c024b74a475078af36632728a34a509 | |
| parent | d3001ed3a82ec2696bb13c78092d0a3460003fd7 (diff) | |
| download | blackbird-obmc-linux-03477d945f13a284d35a757b2c2323d165d5cd81.tar.gz blackbird-obmc-linux-03477d945f13a284d35a757b2c2323d165d5cd81.zip | |
btrfs: qgroup: fix limit args override whole limit struct
btrfs_limit_group use arg limit to override the old qgroup_limit of
corresponding qgroup. However, we should override part of old qgroup_limit
according to the bit which has been set in arg limit.
Signed-off-by: Fan Chengniang <fancn.fnst@cn.fujitsu.com>
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
| -rw-r--r-- | fs/btrfs/qgroup.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 5d1d75611745..5c2aaccbe3da 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1185,11 +1185,16 @@ int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, } spin_lock(&fs_info->qgroup_lock); - qgroup->lim_flags = limit->flags; - qgroup->max_rfer = limit->max_rfer; - qgroup->max_excl = limit->max_excl; - qgroup->rsv_rfer = limit->rsv_rfer; - qgroup->rsv_excl = limit->rsv_excl; + 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; + qgroup->lim_flags |= limit->flags; + spin_unlock(&fs_info->qgroup_lock); ret = update_qgroup_limit_item(trans, quota_root, qgroup); |
