From patchwork Wed Jul 5 16:34:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Izard X-Patchwork-Id: 784735 X-Patchwork-Delegate: david.oberhollenzer@sigma-star.at Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x2mgL086Lz9s71 for ; Thu, 6 Jul 2017 02:34:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uAmVNM14"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dmdRuyWA"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=daDcQF1wEJWImE5NnNzUof+L+L07sQjkkkJruEkOn+8=; b=uAm VNM14M65ZZovtaJkXzXub1PVD52M6iE2RnhVhN0vFol2Jx2y/YgQ8VhWdZk2nQllYkQmMgC8IZmAN mC+cQhBcqfkDoo+J9x42oZQgo4+oHm/IAGTaNJdIlMEMwvu6zqozU1Os+8BxZKoGMqM7t2oO97RZG 1M6muv88GzKCYja2M9mCnN5wYdayuMsD94vPO0zTmfvAvGNpb0vm4ru2LmMMcetbkBch7d26iiBs3 yVfZpN4Zmpll32i0x7DIWKJmjzwVYBMAapd+O/o5t8aVrxoJQUUB7yY2gMdt+SKIrksKzG1Ck+RnC dq44EiHeD7GJzNQ+W9TzMXmone0QAiA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dSnGI-0006b4-71; Wed, 05 Jul 2017 16:34:46 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dSnGE-0006Zn-Uv for linux-mtd@lists.infradead.org; Wed, 05 Jul 2017 16:34:44 +0000 Received: by mail-wm0-x242.google.com with SMTP id p204so33699427wmg.1 for ; Wed, 05 Jul 2017 09:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=+H+JRBVWFwbjPV48qXVOkHcAJp1NGpqtlX4dBiAV0n0=; b=dmdRuyWAoAKh966dul573+YA1gP2ITXAE3R5nJDBCE64S4MtRTHbQIdTA0nx2XCjQi REjvNMsmik74lyVYGXHVP38XYKF0wqADkd2fMI8Fvm9nY5gsOM0YQXYOCYBZCGRpUx3I JU4s54ZG1pbErqfyz7CF0wOD0p5sLcXL24dTDHjtOyUVGbGQMd4LtYznwh/cwz3F1JpQ QvfthfJLbFVRcRVzvYBhl0RFkNAkOFRv8UnC5c7clHH30LggJoGW99/XC+gHODoFnsAf m1R3QjUv0ch+JitoLQQS4Lp5U9PTaAii3zxcNfgppcdkXgJ73RY2hFgof/49Lyy8zwUe zGXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+H+JRBVWFwbjPV48qXVOkHcAJp1NGpqtlX4dBiAV0n0=; b=jkfvXhzM1FVPvadBr7awTQhxBk3bT5ob3fC+ZeamuFq/4nRXuPMmajCL1RjBJUvTNB qHxovDJZkPaIqNF9oQtKawkRsrZBQEWp18QW3/JMm9J8jGn9ycnZu0g0OoFdRB+L4kl6 iWQdj92otko6s9iGU1rIiOIW1yUMunqxCZzBmeyjTSXMcxVZ0ffBc/Zl7HxCYt1ZCkVI nXbEp0N2Rk03Kv6NAt6kviExRXCqp6CAQX1XVob6kL79UCpLefMOE5SjW0iQY2njpn3f opdNUhZXA78vfSyOJPnmU8feMHae2V3HzyriTg3zusNDj+ZjgLEbZasI86XxDTAFnE0k O1Uw== X-Gm-Message-State: AKS2vOwB9t4IQ+sgj4oO9SUjgaIVN1lxKIyN2r3ytRva5TC8v4pKDiLB i/Qe29y3gvxcLw== X-Received: by 10.28.225.133 with SMTP id y127mr31542714wmg.51.1499272460502; Wed, 05 Jul 2017 09:34:20 -0700 (PDT) Received: from localhost.localdomain (146.187.3.109.rev.sfr.net. [109.3.187.146]) by smtp.gmail.com with ESMTPSA id g5sm12246990wmf.5.2017.07.05.09.34.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 09:34:19 -0700 (PDT) From: Romain Izard To: David Oberhollenzer Subject: [PATCH] mkfs.ubifs: Only require 17 LEBs Date: Wed, 5 Jul 2017 18:34:11 +0200 Message-Id: <20170705163411.23546-1-romain.izard.pro@gmail.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170705_093443_179583_0BD71BE6 X-CRM114-Status: GOOD ( 10.70 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (romain.izard.pro[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Izard , linux-mtd@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The minimum size for a UBIFS volume is 17 LEBs. As mkfs.ubifs counted the reserved log and orphan blocks twice, the program did not allow such a small volume. Fix the calculations to be able to build an image with 17 LEBs. With this, the following command works: mkfs.ubifs -c 17 -l2 -m 2048 -e 124KiB -o small.ubifs Signed-off-by: Romain Izard --- ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c index 9e69a4f..ba0293c 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -331,6 +331,9 @@ static long long add_space_overhead(long long size) return size / divisor; } +#define UBIFS_MIN_LEB_NOLOG (UBIFS_MIN_LEB_CNT - UBIFS_MIN_LOG_LEBS) +#define UBIFS_MIN_LEB_NOORPH (UBIFS_MIN_LEB_CNT - UBIFS_MIN_ORPH_LEBS) + static int validate_options(void) { int tmp; @@ -372,15 +375,15 @@ static int validate_options(void) if (c->log_lebs < UBIFS_MIN_LOG_LEBS) return err_msg("too few log LEBs, minimum is %d", UBIFS_MIN_LOG_LEBS); - if (c->log_lebs >= c->max_leb_cnt - UBIFS_MIN_LEB_CNT) + if (c->log_lebs > c->max_leb_cnt - UBIFS_MIN_LEB_NOLOG) return err_msg("too many log LEBs, maximum is %d", - c->max_leb_cnt - UBIFS_MIN_LEB_CNT); + c->max_leb_cnt - UBIFS_MIN_LEB_NOLOG); if (c->orph_lebs < UBIFS_MIN_ORPH_LEBS) return err_msg("too few orphan LEBs, minimum is %d", UBIFS_MIN_ORPH_LEBS); - if (c->orph_lebs >= c->max_leb_cnt - UBIFS_MIN_LEB_CNT) + if (c->orph_lebs > c->max_leb_cnt - UBIFS_MIN_LEB_NOORPH) return err_msg("too many orphan LEBs, maximum is %d", - c->max_leb_cnt - UBIFS_MIN_LEB_CNT); + c->max_leb_cnt - UBIFS_MIN_LEB_NOORPH); tmp = UBIFS_SB_LEBS + UBIFS_MST_LEBS + c->log_lebs + c->lpt_lebs; tmp += c->orph_lebs + 4; if (tmp > c->max_leb_cnt)