From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44700C43331 for ; Mon, 11 Nov 2019 18:49:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D462222C1 for ; Mon, 11 Nov 2019 18:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498145; bh=j5CCEFjOwFx4QIPsec2MwI1geNv6hrXs7BjEbUEosnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LXNMpZIql7slSDUiBzqgYh1YFpq5NYffQAzXYxRK/M6uU6t0YKJ2HBbNonpPHOVg/ BS80mmQ0Wr9NVM/Za2iaOvR9o3o3I62xM86t3HztwhhLLKxM8jB+/3ylxU9ru9TVoT Fon3MGHeFX5smrWrwOzOyHX4pBKoVwV87P98oEhI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730280AbfKKStD (ORCPT ); Mon, 11 Nov 2019 13:49:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:42262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727031AbfKKStC (ORCPT ); Mon, 11 Nov 2019 13:49:02 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2B56B21925; Mon, 11 Nov 2019 18:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498141; bh=j5CCEFjOwFx4QIPsec2MwI1geNv6hrXs7BjEbUEosnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s0NKV+Vmihu5wre5bajD944IDjdbz9hA9uqqb9H0GMoAIHNA+KmTeDkIsEcSOMFsk emLVqQs/Plr6OKxH6cefbUIRMrMD3nUx2YDX2QXjdqhwYkWIDAdyjdXAEDBspvzFjJ Uz6qP0fckwGYNxr2ODUl0rCLT8VXliQF0lR+dQ/A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Borisov , Anand Jain , Qu Wenruo , David Sterba Subject: [PATCH 5.3 035/193] btrfs: Consider system chunk array size for new SYSTEM chunks Date: Mon, 11 Nov 2019 19:26:57 +0100 Message-Id: <20191111181503.569237542@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qu Wenruo commit c17add7a1c61a15578e4071ed7bfd460fd041c43 upstream. For SYSTEM chunks, despite the regular chunk item size limit, there is another limit due to system chunk array size. The extra limit was removed in a refactoring, so add it back. Fixes: e3ecdb3fdecf ("btrfs: factor out devs_max setting in __btrfs_alloc_chunk") CC: stable@vger.kernel.org # 5.3+ Reviewed-by: Nikolay Borisov Reviewed-by: Anand Jain Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/volumes.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4976,6 +4976,7 @@ static int __btrfs_alloc_chunk(struct bt } else if (type & BTRFS_BLOCK_GROUP_SYSTEM) { max_stripe_size = SZ_32M; max_chunk_size = 2 * max_stripe_size; + devs_max = min_t(int, devs_max, BTRFS_MAX_DEVS_SYS_CHUNK); } else { btrfs_err(info, "invalid chunk type 0x%llx requested", type);