diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2012-09-14 20:06:30 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-09-14 20:06:30 -0400 |
| commit | f3a87f1b0c4086a408eda48e4c26e32ff80d3124 (patch) | |
| tree | df6fe75a4607ca8dad0ea0289329c29e40ff2d7d | |
| parent | 256dd1bb3750ac5ad49b40887c1691788dc44b33 (diff) | |
Revert "Btrfs: fix some error codes in btrfs_qgroup_inherit()"
This reverts commit 5986802c2fcc754040bb7ed95f30bb16c4a843b7.
Both paths are not error paths but regular cases where non-qgroup
subvols are involved.
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
| -rw-r--r-- | fs/btrfs/qgroup.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 38b42e7bc91d..b65015581744 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
| @@ -1371,10 +1371,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, | |||
| 1371 | 1371 | ||
| 1372 | if (srcid) { | 1372 | if (srcid) { |
| 1373 | srcgroup = find_qgroup_rb(fs_info, srcid); | 1373 | srcgroup = find_qgroup_rb(fs_info, srcid); |
| 1374 | if (!srcgroup) { | 1374 | if (!srcgroup) |
| 1375 | ret = -EINVAL; | ||
| 1376 | goto unlock; | 1375 | goto unlock; |
| 1377 | } | ||
| 1378 | dstgroup->rfer = srcgroup->rfer - level_size; | 1376 | dstgroup->rfer = srcgroup->rfer - level_size; |
| 1379 | dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size; | 1377 | dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size; |
| 1380 | srcgroup->excl = level_size; | 1378 | srcgroup->excl = level_size; |
| @@ -1383,10 +1381,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, | |||
| 1383 | qgroup_dirty(fs_info, srcgroup); | 1381 | qgroup_dirty(fs_info, srcgroup); |
| 1384 | } | 1382 | } |
| 1385 | 1383 | ||
| 1386 | if (!inherit) { | 1384 | if (!inherit) |
| 1387 | ret = -EINVAL; | ||
| 1388 | goto unlock; | 1385 | goto unlock; |
| 1389 | } | ||
| 1390 | 1386 | ||
| 1391 | i_qgroups = (u64 *)(inherit + 1); | 1387 | i_qgroups = (u64 *)(inherit + 1); |
| 1392 | for (i = 0; i < inherit->num_qgroups; ++i) { | 1388 | for (i = 0; i < inherit->num_qgroups; ++i) { |
