[BTRFS] Reduce diff with upstream