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 9EEA4C3815B for ; Mon, 20 Apr 2020 12:54:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7AC41206E9 for ; Mon, 20 Apr 2020 12:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587387262; bh=dy4xTZ5FaeiZ7KLejdiSar2ZviNd30StLjwUMjAv1dA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rEADuhmZpjs6kIpMdQvZ/T5SPg9yq1dzIe2Zc1m6scMSWiW63vvUOg45l2VCKcH9j kE4umCDI+nMJNQHKMBoHr/YjHA6Wm6nBQq5GHO97UE2ykHciiROoxycHHLwA8RGjEu ghzhHvoCRx9DQ64xEGkmZaPBLuphKu1ldanE86w0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728797AbgDTMyK (ORCPT ); Mon, 20 Apr 2020 08:54:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:42040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728944AbgDTMqc (ORCPT ); Mon, 20 Apr 2020 08:46:32 -0400 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 E75DB2078E; Mon, 20 Apr 2020 12:46:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386792; bh=dy4xTZ5FaeiZ7KLejdiSar2ZviNd30StLjwUMjAv1dA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zfK0hiF6hEcsg64Z6QH4C/a9dFBf0OLntPS6PqgxNvUpAMY15feSrJQISwLY0qolh ZVPOzWimsl1ty+HBPQeXUcvqaEZWmr7G7nC3nSCRvqsRfskYuKDatQSDztDS0BSlxY lsjewS5fVRkuZghOLJ1+uREfDVSw09r+r7zwcKRM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andreas Dilger , Josh Triplett , Theodore Tso Subject: [PATCH 5.4 28/60] ext4: fix incorrect inodes per group in error message Date: Mon, 20 Apr 2020 14:39:06 +0200 Message-Id: <20200420121509.113179131@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121500.490651540@linuxfoundation.org> References: <20200420121500.490651540@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Josh Triplett commit b9c538da4e52a7b79dfcf4cfa487c46125066dfb upstream. 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: Greg Kroah-Hartman --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4109,7 +4109,7 @@ static int ext4_fill_super(struct super_ 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 /