From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Date: Wed, 7 Mar 2012 14:08:30 +0000 (+0200)
Subject: mkfs.ubifs: do not ignore --max-leb-cnt when formatting an UBI volume
X-Git-Tag: v1.5.0~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c36e0067ffdae9ca83abae89f2d22dc9013d9734;p=mtd-utils.git

mkfs.ubifs: do not ignore --max-leb-cnt when formatting an UBI volume

When the output file is an UBI volume - mkfs.ubifs just sets --max-leb-cnt
to the volume size and ignores the user-supplied --max-leb-cnt value, which
is wrong. Let's set it to the volume size only if the user did not supply
--max-leb-cnt.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---

diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c
index f77e5e6..bb25dc3 100644
--- a/mkfs.ubifs/mkfs.ubifs.c
+++ b/mkfs.ubifs/mkfs.ubifs.c
@@ -667,7 +667,8 @@ static int get_options(int argc, char**argv)
 	if (out_ubi) {
 		c->min_io_size = c->di.min_io_size;
 		c->leb_size = c->vi.leb_size;
-		c->max_leb_cnt = c->vi.rsvd_lebs;
+		if (c->max_leb_cnt == -1)
+			c->max_leb_cnt = c->vi.rsvd_lebs;
 	}
 
 	if (c->min_io_size == -1)