Commit f3a87f1b authored by Chris Mason's avatar Chris Mason

Revert "Btrfs: fix some error codes in btrfs_qgroup_inherit()"

This reverts commit 5986802c.

Both paths are not error paths but regular cases where non-qgroup
subvols are involved.
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 256dd1bb
...@@ -1371,10 +1371,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, ...@@ -1371,10 +1371,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
if (srcid) { if (srcid) {
srcgroup = find_qgroup_rb(fs_info, srcid); srcgroup = find_qgroup_rb(fs_info, srcid);
if (!srcgroup) { if (!srcgroup)
ret = -EINVAL;
goto unlock; goto unlock;
}
dstgroup->rfer = srcgroup->rfer - level_size; dstgroup->rfer = srcgroup->rfer - level_size;
dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size; dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size;
srcgroup->excl = level_size; srcgroup->excl = level_size;
...@@ -1383,10 +1381,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, ...@@ -1383,10 +1381,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
qgroup_dirty(fs_info, srcgroup); qgroup_dirty(fs_info, srcgroup);
} }
if (!inherit) { if (!inherit)
ret = -EINVAL;
goto unlock; goto unlock;
}
i_qgroups = (u64 *)(inherit + 1); i_qgroups = (u64 *)(inherit + 1);
for (i = 0; i < inherit->num_qgroups; ++i) { for (i = 0; i < inherit->num_qgroups; ++i) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment