Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f3a87f1b0c4086a408eda48e4c26e32ff80d3124

Authored by Chris Mason
1 parent 256dd1bb37
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 2 additions and 6 deletions Side-by-side Diff

... ... @@ -1371,10 +1371,8 @@
1371 1371  
1372 1372 if (srcid) {
1373 1373 srcgroup = find_qgroup_rb(fs_info, srcid);
1374   - if (!srcgroup) {
1375   - ret = -EINVAL;
  1374 + if (!srcgroup)
1376 1375 goto unlock;
1377   - }
1378 1376 dstgroup->rfer = srcgroup->rfer - level_size;
1379 1377 dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size;
1380 1378 srcgroup->excl = level_size;
1381 1379  
... ... @@ -1383,10 +1381,8 @@
1383 1381 qgroup_dirty(fs_info, srcgroup);
1384 1382 }
1385 1383  
1386   - if (!inherit) {
1387   - ret = -EINVAL;
  1384 + if (!inherit)
1388 1385 goto unlock;
1389   - }
1390 1386  
1391 1387 i_qgroups = (u64 *)(inherit + 1);
1392 1388 for (i = 0; i < inherit->num_qgroups; ++i) {