Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dccbc919 authored by Daniel Golle's avatar Daniel Golle Committed by Richard Weinberger
Browse files

ubifs: Silence early error messages if MS_SILENT is set 



Probe-mounting a volume too small for UBIFS results in kernel log
polution which might irritate users.
Address this by silencing errors which may happen during boot if the
rootfs is e.g. squashfs (and thus rather small) stored on a UBI volume.

Signed-off-by: default avatarDaniel Golle <daniel@makrotopia.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 714fb87e

fs/ubifs/super.c

+7 −7
Original line number Diff line number Diff line
@@ -520,19 +520,19 @@ static int init_constants_early(struct ubifs_info *c) 
	c->max_write_shift = fls(c->max_write_size) - 1;



	if (c->leb_size < UBIFS_MIN_LEB_SZ) {

		ubifs_err(c, "too small LEBs (%d bytes), min. is %d bytes",

		ubifs_errc(c, "too small LEBs (%d bytes), min. is %d bytes",

			   c->leb_size, UBIFS_MIN_LEB_SZ);

		return -EINVAL;

	}



	if (c->leb_cnt < UBIFS_MIN_LEB_CNT) {

		ubifs_err(c, "too few LEBs (%d), min. is %d",

		ubifs_errc(c, "too few LEBs (%d), min. is %d",

			   c->leb_cnt, UBIFS_MIN_LEB_CNT);

		return -EINVAL;

	}



	if (!is_power_of_2(c->min_io_size)) {

		ubifs_err(c, "bad min. I/O size %d", c->min_io_size);

		ubifs_errc(c, "bad min. I/O size %d", c->min_io_size);

		return -EINVAL;

	}
@@ -543,7 +543,7 @@ static int init_constants_early(struct ubifs_info *c) 
	if (c->max_write_size < c->min_io_size ||

	    c->max_write_size % c->min_io_size ||

	    !is_power_of_2(c->max_write_size)) {

		ubifs_err(c, "bad write buffer size %d for %d min. I/O unit",

		ubifs_errc(c, "bad write buffer size %d for %d min. I/O unit",

			   c->max_write_size, c->min_io_size);

		return -EINVAL;

	}