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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 15397C2BA19 for ; Wed, 15 Apr 2020 12:26:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB12920936 for ; Wed, 15 Apr 2020 12:26:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586953607; bh=U8iZwEvvcEiETgEnpw128hyH9fq1RpHbCkQl1Gv9xrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=avRbSR//o9HhmZUC2whx/aQ9S2Jpc5+9303IwWGHGBk6QCxyM54K91+ibpRPEwcVi vlau9CzkE2/ch9WsM8FJmnN96tvnmY8i6IuCIcx5T1At2JqCBbNHDEChjMtQiz+5C9 t5FDM+0BptM+8ceZGXJqX+1bi4R88BLwAsn13RXU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S369268AbgDOM03 (ORCPT ); Wed, 15 Apr 2020 08:26:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:38940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409167AbgDOLpX (ORCPT ); Wed, 15 Apr 2020 07:45:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5DFF520768; Wed, 15 Apr 2020 11:45:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586951123; bh=U8iZwEvvcEiETgEnpw128hyH9fq1RpHbCkQl1Gv9xrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nylwdm0Nm3LFV4KbZaQ+xmw7ox2RhbhV4dens6uskoM0wDrJCOWdgXTpftq8lTkrg 6TVkOEPO92qexi5wnW9ILsIi3CvnPV2OfPY/1xYeHJa8DaVCs+YoTTMISTZ8YUn24z Xzme7xlpg7jDHUoSo3w3G7rwkdnKStZRkFy4dJ3o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josh Triplett , Andreas Dilger , Theodore Ts'o , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 36/84] ext4: fix incorrect inodes per group in error message Date: Wed, 15 Apr 2020 07:43:53 -0400 Message-Id: <20200415114442.14166-36-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415114442.14166-1-sashal@kernel.org> References: <20200415114442.14166-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Josh Triplett [ Upstream commit b9c538da4e52a7b79dfcf4cfa487c46125066dfb ] If ext4_fill_super detects an invalid number of inodes per group, the resulting error message printed the number of blocks per group, rather than the number of inodes per group. Fix it to print the correct value. Fixes: cd6bb35bf7f6d ("ext4: use more strict checks for inodes_per_block on mount") Link: https://lore.kernel.org/r/8be03355983a08e5d4eed480944613454d7e2550.1585434649.git.josh@joshtriplett.org Reviewed-by: Andreas Dilger Signed-off-by: Josh Triplett Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 855b36d77f4fd..e9845c6fbd199 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4110,7 +4110,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) if (sbi->s_inodes_per_group < sbi->s_inodes_per_block || sbi->s_inodes_per_group > blocksize * 8) { ext4_msg(sb, KERN_ERR, "invalid inodes per group: %lu\n", - sbi->s_blocks_per_group); + sbi->s_inodes_per_group); goto failed_mount; } sbi->s_itb_per_group = sbi->s_inodes_per_group / -- 2.20.1