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,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 64F96C3815B for ; Wed, 15 Apr 2020 12:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 386F6206A2 for ; Wed, 15 Apr 2020 12:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586954655; bh=7pPKbbQiiIW1pQ9v+MTWqY9mIKVp1u4JT5lVPI9A2Zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kn2fwEjEO16IHI8/ux7cXCGXQeaLZWrOo8q/THIOZzcLuU5RCEahJau2+6Z79C7F9 OuYJ5+vJqGluGeelKt1jXF2Qvu5HKK/Ohpj343icjLEA9iuJHBhFjFoHtGpm914LLl oKM+co9R8k5khJKAwCmVJm1ZoClJdLw1DDLkPWRc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S370145AbgDOMoL (ORCPT ); Wed, 15 Apr 2020 08:44:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:35326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897513AbgDOLnZ (ORCPT ); Wed, 15 Apr 2020 07:43:25 -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 C8C9C206A2; Wed, 15 Apr 2020 11:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586951005; bh=7pPKbbQiiIW1pQ9v+MTWqY9mIKVp1u4JT5lVPI9A2Zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mNAaHN5m4TZ5ZLcNeiGwkKgF49mKekkXTpChodxmvBXOeyKNJaCIT9Z1/xfIy9MRy 0CIcHCue8V2YpzJXlXl9hzS1b2+eLgT0cczIsAu6Kxv0t3FdnH9h3I8f1AoTuohdNV 7rTry2nwu5xjv5XjXMzGwTp+58upBXhR8Qjm/fy8= 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.5 050/106] ext4: fix incorrect inodes per group in error message Date: Wed, 15 Apr 2020 07:41:30 -0400 Message-Id: <20200415114226.13103-50-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415114226.13103-1-sashal@kernel.org> References: <20200415114226.13103-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@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 3b4fc5036d91b..2b081f26a9f13 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4113,7 +4113,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