diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-16 12:58:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-16 12:58:44 -0700 |
| commit | 6167f81fd1054881d7476f57a8897ae4a477fa8b (patch) | |
| tree | 96529bbf38c5933e188711db56d55c61540ffe46 | |
| parent | a34689d98059f0c88cef08a78866e81eb53466c9 (diff) | |
| parent | f3a87f1b0c4086a408eda48e4c26e32ff80d3124 (diff) | |
| download | op-kernel-dev-6167f81fd1054881d7476f57a8897ae4a477fa8b.zip op-kernel-dev-6167f81fd1054881d7476f57a8897ae4a477fa8b.tar.gz | |
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()"
| -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 38b42e7..b650155 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -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) { |
