Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3a87f1b authored by Chris Mason's avatar Chris Mason
Browse files

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

fs/btrfs/qgroup.c

+2 −6
Original line number Diff line number Diff line
@@ -1371,10 +1371,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, 


	if (srcid) {

		srcgroup = find_qgroup_rb(fs_info, srcid);

		if (!srcgroup) {

			ret = -EINVAL;

		if (!srcgroup)

			goto unlock;

		}

		dstgroup->rfer = srcgroup->rfer - level_size;

		dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size;

		srcgroup->excl = level_size;
@@ -1383,10 +1381,8 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, 
		qgroup_dirty(fs_info, srcgroup);

	}



	if (!inherit) {

		ret = -EINVAL;

	if (!inherit)

		goto unlock;

	}



	i_qgroups = (u64 *)(inherit + 1);

	for (i = 0; i < inherit->num_qgroups; ++i) {