diff options
| author | Yang Dongsheng <yangds.fnst@cn.fujitsu.com> | 2015-01-06 20:54:42 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-01-21 18:22:37 -0800 |
| commit | 0ee13fe28ce387864c0d2b1e8c52b64abe2fcd02 (patch) | |
| tree | 3d0d556d357af39c09a21eef88eb0b11deece387 /fs | |
| parent | 26455d3318a1e2a38f783db07981e3ed67de40ed (diff) | |
| download | linux-0ee13fe28ce387864c0d2b1e8c52b64abe2fcd02.tar.bz2 | |
btrfs: qgroup: move WARN_ON() to the correct location.
In function qgroup_excl_accounting(), we need to WARN when
qg->excl is less than what we want to free, same to child
and parents. But currently, for parent qgroup, the WARN_ON()
is located after freeing qg->excl. It will WARN out even we
free it normally.
This patch move this WARN_ON() before freeing qg->excl.
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Reviewed-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/qgroup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 48b60dbf807f..97159a8e91d4 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1431,9 +1431,8 @@ static int qgroup_excl_accounting(struct btrfs_fs_info *fs_info, qgroup = u64_to_ptr(unode->aux); qgroup->rfer += sign * oper->num_bytes; qgroup->rfer_cmpr += sign * oper->num_bytes; + WARN_ON(sign < 0 && qgroup->excl < oper->num_bytes); qgroup->excl += sign * oper->num_bytes; - if (sign < 0) - WARN_ON(qgroup->excl < oper->num_bytes); qgroup->excl_cmpr += sign * oper->num_bytes; qgroup_dirty(fs_info, qgroup); |