Skip to content

Commit

Permalink
Btrfs: fix some error codes in btrfs_qgroup_inherit()
Browse files Browse the repository at this point in the history
These are returning zero when it should be returning a negative error
code.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
  • Loading branch information
Dan Carpenter authored and Chris Mason committed Aug 28, 2012
1 parent aa2ffd0 commit 5986802
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions fs/btrfs/qgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1369,8 +1369,10 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,

if (srcid) {
srcgroup = find_qgroup_rb(fs_info, srcid);
if (!srcgroup)
if (!srcgroup) {
ret = -EINVAL;
goto unlock;
}
dstgroup->rfer = srcgroup->rfer - level_size;
dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size;
srcgroup->excl = level_size;
Expand All @@ -1379,8 +1381,10 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
qgroup_dirty(fs_info, srcgroup);
}

if (!inherit)
if (!inherit) {
ret = -EINVAL;
goto unlock;
}

i_qgroups = (u64 *)(inherit + 1);
for (i = 0; i < inherit->num_qgroups; ++i) {
Expand Down

0 comments on commit 5986802

Please sign in to comment.