Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp998885ybb; Sat, 28 Mar 2020 15:42:01 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsfpnoFHjDiBW15SuOflRa4y6w6iKXmgjDU4Ij8PQvZlEa1891scBOZABDSuFCf7cQQxuJ7 X-Received: by 2002:a9d:242:: with SMTP id 60mr3940662otb.294.1585435321627; Sat, 28 Mar 2020 15:42:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585435321; cv=none; d=google.com; s=arc-20160816; b=Xpr97zwS9LhYPLYTQ42jqpAcFU+Nu196HjGTueR/v+9Yf+GCslxIAQCtKnJ+MvsZhx RfBhJVspv5PgX4nsLhxdEHCiv6tQ9ePV10wHG0ZEmtnevv/q/Z/6W6xHZNj9FkoX1r+n FYW7NCmUhkQjfJrShpomSuBeLTZBaWn+4XX73rbEYhGJ1DnOfae1KchRqBsDoTrju50Z 3HBx3ZULR9PS1a630cxOMbNXCwFDCLo+1iPH0j9CJw3V8LSCtQUK8e1vD765L3S9u4Ek uwTayFEDi2BO1vIiXTFHznYS4/fB08GLkHYNEcnwcFeNv/W/Ci8UdxoeccZ+BLNPOGvN qw4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition:mime-version :message-id:subject:cc:to:from:date; bh=Zaoj46qwpEdGIKKTlAeoQfEMoISng9OIQO1kpWbAIYU=; b=GMDw776m3J4W9Q2X1zeOAeo48/gqgEd8OD0qtLvju0nAwBLc5Nq2gTFw1D//TiVw0K njRorkmyTb6AlQ5eAqNwbt7wOJ8MlYFeAWHCXjVudB1lc3JmeQutK0VkTIeNeJlYFSwz 9d/Phv9Wky4ZHGBJ0uNZVmKcM7a0hX40XJqXvUnEFTJEdzBwsHI30SgX6ZYFcdNtR9Q4 CdHJ0dF2R75e4ZxDVrzZ6URhL1okERi3XoAA45JVEsBT9lLGteylZmZXOh8nPEAJeXrU 5PgIWAyb0Sct9NOXzpoWT6AQcE7R8bw4fALYbHh+aywQGzFAfGqbG9YdckP3SFNo8nJu +eeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h3si3407133otg.9.2020.03.28.15.41.40; Sat, 28 Mar 2020 15:42:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727787AbgC1We3 (ORCPT + 99 others); Sat, 28 Mar 2020 18:34:29 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:50115 "EHLO relay5-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727151AbgC1We3 (ORCPT ); Sat, 28 Mar 2020 18:34:29 -0400 X-Originating-IP: 50.39.173.182 Received: from localhost (50-39-173-182.bvtn.or.frontiernet.net [50.39.173.182]) (Authenticated sender: josh@joshtriplett.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id E4C8A1C0004; Sat, 28 Mar 2020 22:34:25 +0000 (UTC) Date: Sat, 28 Mar 2020 15:34:15 -0700 From: Josh Triplett To: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Theodore Ts'o , Andreas Dilger Subject: [PATCH] ext4: Fix incorrect inodes per group in error message Message-ID: <8be03355983a08e5d4eed480944613454d7e2550.1585434649.git.josh@joshtriplett.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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. Signed-off-by: Josh Triplett Fixes: cd6bb35bf7f6d ("ext4: use more strict checks for inodes_per_block on mount") --- 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 0c7c4adb664e..c50922fa780a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4157,7 +4157,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.26.0