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

Commit 6167f81f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull a btrfs revert from Chris Mason:
 "My for-linus branch has one revert in the new quota code.

  We're building up more fixes at etc for the next merge window, but I'm
  keeping them out unless they are bigger regressions or have a huge
  impact."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Revert "Btrfs: fix some error codes in btrfs_qgroup_inherit()"
parents a34689d9 f3a87f1b

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) {