aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-07-30 04:16:10 -0400
committerChris Mason <chris.mason@oracle.com>2012-08-28 16:53:24 -0400
commit5986802c2fcc754040bb7ed95f30bb16c4a843b7 (patch)
treefb9a0d1054a0e345bd6c30fabc7d3726fdf6e2c5 /fs/btrfs
parentaa2ffd06168e25689e0eb9662bf4595ba2bbac14 (diff)
Btrfs: fix some error codes in btrfs_qgroup_inherit()
These are returning zero when it should be returning a negative error code. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/qgroup.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index bc424ae5a81a..229ef8927e6b 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1369,8 +1369,10 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
1369 1369
1370 if (srcid) { 1370 if (srcid) {
1371 srcgroup = find_qgroup_rb(fs_info, srcid); 1371 srcgroup = find_qgroup_rb(fs_info, srcid);
1372 if (!srcgroup) 1372 if (!srcgroup) {
1373 ret = -EINVAL;
1373 goto unlock; 1374 goto unlock;
1375 }
1374 dstgroup->rfer = srcgroup->rfer - level_size; 1376 dstgroup->rfer = srcgroup->rfer - level_size;
1375 dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size; 1377 dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size;
1376 srcgroup->excl = level_size; 1378 srcgroup->excl = level_size;
@@ -1379,8 +1381,10 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
1379 qgroup_dirty(fs_info, srcgroup); 1381 qgroup_dirty(fs_info, srcgroup);
1380 } 1382 }
1381 1383
1382 if (!inherit) 1384 if (!inherit) {
1385 ret = -EINVAL;
1383 goto unlock; 1386 goto unlock;
1387 }
1384 1388
1385 i_qgroups = (u64 *)(inherit + 1); 1389 i_qgroups = (u64 *)(inherit + 1);
1386 for (i = 0; i < inherit->num_qgroups; ++i) { 1390 for (i = 0; i < inherit->num_qgroups; ++i) {