On Thu, Mar 09, 2017 at 02:43:27PM +0100, David Sterba wrote: > The patch does not apply to current master, there's > > 3861 if (bctl->sys.flags & BTRFS_BALANCE_ARGS_CONVERT) { > 3862 fs_info->num_tolerated_disk_barrier_failures = min( > 3863 > btrfs_calc_num_tolerated_disk_barrier_failures(fs_info), > 3864 btrfs_get_num_tolerated_disk_barrier_failures( > 3865 bctl->sys.target)); > 3866 } > 3867 > > followed by the line below, I'll merge that manually but slightly wonder > which branch you have used as a base. No big deal though, I'll add the > patch to the queue. Thanks. > > > ret = insert_balance_item(fs_info, bctl);
I had Qu's chunk counting patchset in my tree (and some irrelevant stuff, like tty patches). But this means there'll be a minor conflict between the two once you get around to merging Qu's stuff. It's obvious how they interact; the bogus warning happens with and without chunk counting. -- ⢀⣴⠾⠻⢶⣦⠀ Meow! ⣾⠁⢠⠒⠀⣿⡁ ⢿⡄⠘⠷⠚⠋⠀ Collisions shmolisions, let's see them find a collision or second ⠈⠳⣄⠀⠀⠀⠀ preimage for double rot13! -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html