tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()"

Linus Torvalds 6167f81f a34689d9

+2 -6
+2 -6
fs/btrfs/qgroup.c
··· 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 1383 qgroup_dirty(fs_info, srcgroup); 1382 1384 } 1383 1385 1384 - if (!inherit) { 1385 - ret = -EINVAL; 1386 + if (!inherit) 1386 1387 goto unlock; 1387 - } 1388 1388 1389 1389 i_qgroups = (u64 *)(inherit + 1); 1390 1390 for (i = 0; i < inherit->num_qgroups; ++i) {