UBIFS: print less

UBIFS currently prints a lot of information when it mounts a volume, which bothers some people. Make it less chatty - print only important information by default. Get rid of 'dbg_msg()' macro completely. Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

UBIFS: print less
UBIFS currently prints a lot of information when it mounts a volume, which bothers some people. Make it less chatty - print only important information by default. Get rid of 'dbg_msg()' macro completely. Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Artem Bityutskiy
1 parent 6b38d03f48
Showing 8 changed files with 60 additions and 70 deletions Side-by-side Diff
fs/ubifs/commit.c
fs/ubifs/debug.h
fs/ubifs/lprops.c
fs/ubifs/lpt.c
fs/ubifs/lpt_commit.c
fs/ubifs/replay.c
fs/ubifs/super.c
fs/ubifs/tnc_misc.c
@@ -293,8 +293,8 @@
 	int err;
 	struct ubifs_info *c = info;
  
-	dbg_msg("background thread \"%s\" started, PID %d",
-		c->bgt_name, current->pid);
+	ubifs_msg("background thread \"%s\" started, PID %d",
+		  c->bgt_name, current->pid);
 	set_freezable();
  
 	while (1) {
@@ -328,7 +328,7 @@
 		cond_resched();
 	}
  
-	dbg_msg("background thread \"%s\" stops", c->bgt_name);
+	ubifs_msg("background thread \"%s\" stops", c->bgt_name);
 	return 0;
 }
  
@@ -176,11 +176,6 @@
 		 dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN));    \
 } while (0)
  
-/* Just a debugging messages not related to any specific UBIFS subsystem */
-#define dbg_msg(fmt, ...)                                                      \
-	pr_err("UBIFS DBG (pid %d): %s: " fmt "\n", current->pid,              \
-	       __func__, ##__VA_ARGS__)
-
 /* General messages */
 #define dbg_gen(fmt, ...)   ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__)
 /* Additional journal messages */
@@ -982,9 +982,9 @@
 			goto out;
 		}
 		if (lprops != lp) {
-			dbg_msg("lprops %zx lp %zx lprops->lnum %d lp->lnum %d",
-				(size_t)lprops, (size_t)lp, lprops->lnum,
-				lp->lnum);
+			ubifs_err("lprops %zx lp %zx lprops->lnum %d lp->lnum %d",
+				  (size_t)lprops, (size_t)lp, lprops->lnum,
+				  lp->lnum);
 			err = 4;
 			goto out;
 		}
@@ -1002,7 +1002,7 @@
 	}
 out:
 	if (err) {
-		dbg_msg("failed cat %d hpos %d err %d", cat, i, err);
+		ubifs_err("failed cat %d hpos %d err %d", cat, i, err);
 		dump_stack();
 		ubifs_dump_heap(c, heap, cat);
 	}
@@ -1311,7 +1311,7 @@
 	ubifs_err("error %d reading pnode at %d:%d", err, lnum, offs);
 	ubifs_dump_pnode(c, pnode, parent, iip);
 	dump_stack();
-	dbg_msg("calc num: %d", calc_pnode_num_from_parent(c, parent, iip));
+	ubifs_err("calc num: %d", calc_pnode_num_from_parent(c, parent, iip));
 	kfree(pnode);
 	return err;
 }
@@ -1662,19 +1662,19 @@
 				continue;
 			}
 			if (!dbg_is_all_ff(p, len)) {
-				dbg_msg("invalid empty space in LEB %d at %d",
-					lnum, c->leb_size - len);
+				ubifs_err("invalid empty space in LEB %d at %d",
+					  lnum, c->leb_size - len);
 				err = -EINVAL;
 			}
 			i = lnum - c->lpt_first;
 			if (len != c->ltab[i].free) {
-				dbg_msg("invalid free space in LEB %d (free %d, expected %d)",
-					lnum, len, c->ltab[i].free);
+				ubifs_err("invalid free space in LEB %d (free %d, expected %d)",
+					  lnum, len, c->ltab[i].free);
 				err = -EINVAL;
 			}
 			if (dirty != c->ltab[i].dirty) {
-				dbg_msg("invalid dirty space in LEB %d (dirty %d, expected %d)",
-					lnum, dirty, c->ltab[i].dirty);
+				ubifs_err("invalid dirty space in LEB %d (dirty %d, expected %d)",
+					  lnum, dirty, c->ltab[i].dirty);
 				err = -EINVAL;
 			}
 			goto out;
@@ -141,7 +141,7 @@
 		 * during the replay.
 		 */
 		if (dirty != 0)
-			dbg_msg("LEB %d lp: %d free %d dirty replay: %d free %d dirty",
+			dbg_mnt("LEB %d lp: %d free %d dirty replay: %d free %d dirty",
 				b->bud->lnum, lp->free, lp->dirty, b->free,
 				b->dirty);
 	}
@@ -1160,7 +1160,7 @@
 static int mount_ubifs(struct ubifs_info *c)
 {
 	int err;
-	long long x;
+	long long x, y;
 	size_t sz;
  
 	c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
@@ -1410,74 +1410,69 @@
  
 	c->mounting = 0;
  
-	ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"",
-		  c->vi.ubi_num, c->vi.vol_id, c->vi.name);
-	if (c->ro_mount)
-		ubifs_msg("mounted read-only");
+	ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"%s",
+		  c->vi.ubi_num, c->vi.vol_id, c->vi.name,
+		  c->ro_mount ? ", R/O mode" : NULL);
 	x = (long long)c->main_lebs * c->leb_size;
-	ubifs_msg("file system size:   %lld bytes (%lld KiB, %lld MiB, %d LEBs)",
-		  x, x >> 10, x >> 20, c->main_lebs);
-	x = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
-	ubifs_msg("journal size:       %lld bytes (%lld KiB, %lld MiB, %d LEBs)",
-		  x, x >> 10, x >> 20, c->log_lebs + c->max_bud_cnt);
-	ubifs_msg("media format:       w%d/r%d (latest is w%d/r%d)",
+	y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
+	ubifs_msg("LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",
+		  c->leb_size, c->leb_size >> 10, c->min_io_size,
+		  c->max_write_size);
+	ubifs_msg("FS size: %lld bytes (%lld MiB, %d LEBs), journal size %lld bytes (%lld MiB, %d LEBs)",
+		  x, x >> 20, c->main_lebs,
+		  y, y >> 20, c->log_lebs + c->max_bud_cnt);
+	ubifs_msg("reserved for root: %llu bytes (%llu KiB)",
+		  c->report_rp_size, c->report_rp_size >> 10);
+	ubifs_msg("media format: w%d/r%d (latest is w%d/r%d), UUID %pUB%s",
 		  c->fmt_version, c->ro_compat_version,
-		  UBIFS_FORMAT_VERSION, UBIFS_RO_COMPAT_VERSION);
-	ubifs_msg("default compressor: %s", ubifs_compr_name(c->default_compr));
-	ubifs_msg("reserved for root:  %llu bytes (%llu KiB)",
-		c->report_rp_size, c->report_rp_size >> 10);
+		  UBIFS_FORMAT_VERSION, UBIFS_RO_COMPAT_VERSION, c->uuid,
+		  c->big_lpt ? ", big LPT model" : ", small LPT model");
  
-	dbg_msg("min. I/O unit size:  %d bytes", c->min_io_size);
-	dbg_msg("max. write size:     %d bytes", c->max_write_size);
-	dbg_msg("LEB size:            %d bytes (%d KiB)",
-		c->leb_size, c->leb_size >> 10);
-	dbg_msg("data journal heads:  %d",
+	dbg_gen("default compressor:  %s", ubifs_compr_name(c->default_compr));
+	dbg_gen("data journal heads:  %d",
 		c->jhead_cnt - NONDATA_JHEADS_CNT);
-	dbg_msg("UUID:                %pUB", c->uuid);
-	dbg_msg("big_lpt              %d", c->big_lpt);
-	dbg_msg("log LEBs:            %d (%d - %d)",
+	dbg_gen("log LEBs:            %d (%d - %d)",
 		c->log_lebs, UBIFS_LOG_LNUM, c->log_last);
-	dbg_msg("LPT area LEBs:       %d (%d - %d)",
+	dbg_gen("LPT area LEBs:       %d (%d - %d)",
 		c->lpt_lebs, c->lpt_first, c->lpt_last);
-	dbg_msg("orphan area LEBs:    %d (%d - %d)",
+	dbg_gen("orphan area LEBs:    %d (%d - %d)",
 		c->orph_lebs, c->orph_first, c->orph_last);
-	dbg_msg("main area LEBs:      %d (%d - %d)",
+	dbg_gen("main area LEBs:      %d (%d - %d)",
 		c->main_lebs, c->main_first, c->leb_cnt - 1);
-	dbg_msg("index LEBs:          %d", c->lst.idx_lebs);
-	dbg_msg("total index bytes:   %lld (%lld KiB, %lld MiB)",
+	dbg_gen("index LEBs:          %d", c->lst.idx_lebs);
+	dbg_gen("total index bytes:   %lld (%lld KiB, %lld MiB)",
 		c->bi.old_idx_sz, c->bi.old_idx_sz >> 10,
 		c->bi.old_idx_sz >> 20);
-	dbg_msg("key hash type:       %d", c->key_hash_type);
-	dbg_msg("tree fanout:         %d", c->fanout);
-	dbg_msg("reserved GC LEB:     %d", c->gc_lnum);
-	dbg_msg("first main LEB:      %d", c->main_first);
-	dbg_msg("max. znode size      %d", c->max_znode_sz);
-	dbg_msg("max. index node size %d", c->max_idx_node_sz);
-	dbg_msg("node sizes:          data %zu, inode %zu, dentry %zu",
+	dbg_gen("key hash type:       %d", c->key_hash_type);
+	dbg_gen("tree fanout:         %d", c->fanout);
+	dbg_gen("reserved GC LEB:     %d", c->gc_lnum);
+	dbg_gen("max. znode size      %d", c->max_znode_sz);
+	dbg_gen("max. index node size %d", c->max_idx_node_sz);
+	dbg_gen("node sizes:          data %zu, inode %zu, dentry %zu",
 		UBIFS_DATA_NODE_SZ, UBIFS_INO_NODE_SZ, UBIFS_DENT_NODE_SZ);
-	dbg_msg("node sizes:          trun %zu, sb %zu, master %zu",
+	dbg_gen("node sizes:          trun %zu, sb %zu, master %zu",
 		UBIFS_TRUN_NODE_SZ, UBIFS_SB_NODE_SZ, UBIFS_MST_NODE_SZ);
-	dbg_msg("node sizes:          ref %zu, cmt. start %zu, orph %zu",
+	dbg_gen("node sizes:          ref %zu, cmt. start %zu, orph %zu",
 		UBIFS_REF_NODE_SZ, UBIFS_CS_NODE_SZ, UBIFS_ORPH_NODE_SZ);
-	dbg_msg("max. node sizes:     data %zu, inode %zu dentry %zu, idx %d",
+	dbg_gen("max. node sizes:     data %zu, inode %zu dentry %zu, idx %d",
 		UBIFS_MAX_DATA_NODE_SZ, UBIFS_MAX_INO_NODE_SZ,
 		UBIFS_MAX_DENT_NODE_SZ, ubifs_idx_node_sz(c, c->fanout));
-	dbg_msg("dead watermark:      %d", c->dead_wm);
-	dbg_msg("dark watermark:      %d", c->dark_wm);
-	dbg_msg("LEB overhead:        %d", c->leb_overhead);
+	dbg_gen("dead watermark:      %d", c->dead_wm);
+	dbg_gen("dark watermark:      %d", c->dark_wm);
+	dbg_gen("LEB overhead:        %d", c->leb_overhead);
 	x = (long long)c->main_lebs * c->dark_wm;
-	dbg_msg("max. dark space:     %lld (%lld KiB, %lld MiB)",
+	dbg_gen("max. dark space:     %lld (%lld KiB, %lld MiB)",
 		x, x >> 10, x >> 20);
-	dbg_msg("maximum bud bytes:   %lld (%lld KiB, %lld MiB)",
+	dbg_gen("maximum bud bytes:   %lld (%lld KiB, %lld MiB)",
 		c->max_bud_bytes, c->max_bud_bytes >> 10,
 		c->max_bud_bytes >> 20);
-	dbg_msg("BG commit bud bytes: %lld (%lld KiB, %lld MiB)",
+	dbg_gen("BG commit bud bytes: %lld (%lld KiB, %lld MiB)",
 		c->bg_bud_bytes, c->bg_bud_bytes >> 10,
 		c->bg_bud_bytes >> 20);
-	dbg_msg("current bud bytes    %lld (%lld KiB, %lld MiB)",
+	dbg_gen("current bud bytes    %lld (%lld KiB, %lld MiB)",
 		c->bud_bytes, c->bud_bytes >> 10, c->bud_bytes >> 20);
-	dbg_msg("max. seq. number:    %llu", c->max_sqnum);
-	dbg_msg("commit number:       %llu", c->cmt_no);
+	dbg_gen("max. seq. number:    %llu", c->max_sqnum);
+	dbg_gen("commit number:       %llu", c->cmt_no);
  
 	return 0;
  
@@ -328,8 +328,8 @@
 		case UBIFS_XENT_KEY:
 			break;
 		default:
-			dbg_msg("bad key type at slot %d: %d",
-				i, key_type(c, &zbr->key));
+			ubifs_err("bad key type at slot %d: %d",
+				  i, key_type(c, &zbr->key));
 			err = 3;
 			goto out_dump;
 		}
...	...	@@ -293,8 +293,8 @@
293	293	int err;
294	294	struct ubifs_info *c = info;
295	295
296		- dbg_msg("background thread \"%s\" started, PID %d",
297		- c->bgt_name, current->pid);
	296	+ ubifs_msg("background thread \"%s\" started, PID %d",
	297	+ c->bgt_name, current->pid);
298	298	set_freezable();
299	299
300	300	while (1) {
...	...	@@ -328,7 +328,7 @@
328	328	cond_resched();
329	329	}
330	330
331		- dbg_msg("background thread \"%s\" stops", c->bgt_name);
	331	+ ubifs_msg("background thread \"%s\" stops", c->bgt_name);
332	332	return 0;
333	333	}
334	334
...	...	@@ -176,11 +176,6 @@
176	176	dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN)); \
177	177	} while (0)
178	178
179		-/* Just a debugging messages not related to any specific UBIFS subsystem */
180		-#define dbg_msg(fmt, ...) \
181		- pr_err("UBIFS DBG (pid %d): %s: " fmt "\n", current->pid, \
182		- __func__, ##__VA_ARGS__)
183		-
184	179	/* General messages */
185	180	#define dbg_gen(fmt, ...) ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__)
186	181	/* Additional journal messages */
...	...	@@ -982,9 +982,9 @@
982	982	goto out;
983	983	}
984	984	if (lprops != lp) {
985		- dbg_msg("lprops %zx lp %zx lprops->lnum %d lp->lnum %d",
986		- (size_t)lprops, (size_t)lp, lprops->lnum,
987		- lp->lnum);
	985	+ ubifs_err("lprops %zx lp %zx lprops->lnum %d lp->lnum %d",
	986	+ (size_t)lprops, (size_t)lp, lprops->lnum,
	987	+ lp->lnum);
988	988	err = 4;
989	989	goto out;
990	990	}
...	...	@@ -1002,7 +1002,7 @@
1002	1002	}
1003	1003	out:
1004	1004	if (err) {
1005		- dbg_msg("failed cat %d hpos %d err %d", cat, i, err);
	1005	+ ubifs_err("failed cat %d hpos %d err %d", cat, i, err);
1006	1006	dump_stack();
1007	1007	ubifs_dump_heap(c, heap, cat);
1008	1008	}
...	...	@@ -1311,7 +1311,7 @@
1311	1311	ubifs_err("error %d reading pnode at %d:%d", err, lnum, offs);
1312	1312	ubifs_dump_pnode(c, pnode, parent, iip);
1313	1313	dump_stack();
1314		- dbg_msg("calc num: %d", calc_pnode_num_from_parent(c, parent, iip));
	1314	+ ubifs_err("calc num: %d", calc_pnode_num_from_parent(c, parent, iip));
1315	1315	kfree(pnode);
1316	1316	return err;
1317	1317	}
...	...	@@ -1662,19 +1662,19 @@
1662	1662	continue;
1663	1663	}
1664	1664	if (!dbg_is_all_ff(p, len)) {
1665		- dbg_msg("invalid empty space in LEB %d at %d",
1666		- lnum, c->leb_size - len);
	1665	+ ubifs_err("invalid empty space in LEB %d at %d",
	1666	+ lnum, c->leb_size - len);
1667	1667	err = -EINVAL;
1668	1668	}
1669	1669	i = lnum - c->lpt_first;
1670	1670	if (len != c->ltab[i].free) {
1671		- dbg_msg("invalid free space in LEB %d (free %d, expected %d)",
1672		- lnum, len, c->ltab[i].free);
	1671	+ ubifs_err("invalid free space in LEB %d (free %d, expected %d)",
	1672	+ lnum, len, c->ltab[i].free);
1673	1673	err = -EINVAL;
1674	1674	}
1675	1675	if (dirty != c->ltab[i].dirty) {
1676		- dbg_msg("invalid dirty space in LEB %d (dirty %d, expected %d)",
1677		- lnum, dirty, c->ltab[i].dirty);
	1676	+ ubifs_err("invalid dirty space in LEB %d (dirty %d, expected %d)",
	1677	+ lnum, dirty, c->ltab[i].dirty);
1678	1678	err = -EINVAL;
1679	1679	}
1680	1680	goto out;
...	...	@@ -141,7 +141,7 @@
141	141	* during the replay.
142	142	*/
143	143	if (dirty != 0)
144		- dbg_msg("LEB %d lp: %d free %d dirty replay: %d free %d dirty",
	144	+ dbg_mnt("LEB %d lp: %d free %d dirty replay: %d free %d dirty",
145	145	b->bud->lnum, lp->free, lp->dirty, b->free,
146	146	b->dirty);
147	147	}
...	...	@@ -1160,7 +1160,7 @@
1160	1160	static int mount_ubifs(struct ubifs_info *c)
1161	1161	{
1162	1162	int err;
1163		- long long x;
	1163	+ long long x, y;
1164	1164	size_t sz;
1165	1165
1166	1166	c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
1167	1167
1168	1168
1169	1169
1170	1170
1171	1171
1172	1172
1173	1173
1174	1174
1175	1175
1176	1176
1177	1177
1178	1178
1179	1179
1180	1180
1181	1181
1182	1182
1183	1183
1184	1184
...	...	@@ -1410,74 +1410,69 @@
1410	1410
1411	1411	c->mounting = 0;
1412	1412
1413		- ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"",
1414		- c->vi.ubi_num, c->vi.vol_id, c->vi.name);
1415		- if (c->ro_mount)
1416		- ubifs_msg("mounted read-only");
	1413	+ ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"%s",
	1414	+ c->vi.ubi_num, c->vi.vol_id, c->vi.name,
	1415	+ c->ro_mount ? ", R/O mode" : NULL);
1417	1416	x = (long long)c->main_lebs * c->leb_size;
1418		- ubifs_msg("file system size: %lld bytes (%lld KiB, %lld MiB, %d LEBs)",
1419		- x, x >> 10, x >> 20, c->main_lebs);
1420		- x = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
1421		- ubifs_msg("journal size: %lld bytes (%lld KiB, %lld MiB, %d LEBs)",
1422		- x, x >> 10, x >> 20, c->log_lebs + c->max_bud_cnt);
1423		- ubifs_msg("media format: w%d/r%d (latest is w%d/r%d)",
	1417	+ y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
	1418	+ ubifs_msg("LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",
	1419	+ c->leb_size, c->leb_size >> 10, c->min_io_size,
	1420	+ c->max_write_size);
	1421	+ ubifs_msg("FS size: %lld bytes (%lld MiB, %d LEBs), journal size %lld bytes (%lld MiB, %d LEBs)",
	1422	+ x, x >> 20, c->main_lebs,
	1423	+ y, y >> 20, c->log_lebs + c->max_bud_cnt);
	1424	+ ubifs_msg("reserved for root: %llu bytes (%llu KiB)",
	1425	+ c->report_rp_size, c->report_rp_size >> 10);
	1426	+ ubifs_msg("media format: w%d/r%d (latest is w%d/r%d), UUID %pUB%s",
1424	1427	c->fmt_version, c->ro_compat_version,
1425		- UBIFS_FORMAT_VERSION, UBIFS_RO_COMPAT_VERSION);
1426		- ubifs_msg("default compressor: %s", ubifs_compr_name(c->default_compr));
1427		- ubifs_msg("reserved for root: %llu bytes (%llu KiB)",
1428		- c->report_rp_size, c->report_rp_size >> 10);
	1428	+ UBIFS_FORMAT_VERSION, UBIFS_RO_COMPAT_VERSION, c->uuid,
	1429	+ c->big_lpt ? ", big LPT model" : ", small LPT model");
1429	1430
1430		- dbg_msg("min. I/O unit size: %d bytes", c->min_io_size);
1431		- dbg_msg("max. write size: %d bytes", c->max_write_size);
1432		- dbg_msg("LEB size: %d bytes (%d KiB)",
1433		- c->leb_size, c->leb_size >> 10);
1434		- dbg_msg("data journal heads: %d",
	1431	+ dbg_gen("default compressor: %s", ubifs_compr_name(c->default_compr));
	1432	+ dbg_gen("data journal heads: %d",
1435	1433	c->jhead_cnt - NONDATA_JHEADS_CNT);
1436		- dbg_msg("UUID: %pUB", c->uuid);
1437		- dbg_msg("big_lpt %d", c->big_lpt);
1438		- dbg_msg("log LEBs: %d (%d - %d)",
	1434	+ dbg_gen("log LEBs: %d (%d - %d)",
1439	1435	c->log_lebs, UBIFS_LOG_LNUM, c->log_last);
1440		- dbg_msg("LPT area LEBs: %d (%d - %d)",
	1436	+ dbg_gen("LPT area LEBs: %d (%d - %d)",
1441	1437	c->lpt_lebs, c->lpt_first, c->lpt_last);
1442		- dbg_msg("orphan area LEBs: %d (%d - %d)",
	1438	+ dbg_gen("orphan area LEBs: %d (%d - %d)",
1443	1439	c->orph_lebs, c->orph_first, c->orph_last);
1444		- dbg_msg("main area LEBs: %d (%d - %d)",
	1440	+ dbg_gen("main area LEBs: %d (%d - %d)",
1445	1441	c->main_lebs, c->main_first, c->leb_cnt - 1);
1446		- dbg_msg("index LEBs: %d", c->lst.idx_lebs);
1447		- dbg_msg("total index bytes: %lld (%lld KiB, %lld MiB)",
	1442	+ dbg_gen("index LEBs: %d", c->lst.idx_lebs);
	1443	+ dbg_gen("total index bytes: %lld (%lld KiB, %lld MiB)",
1448	1444	c->bi.old_idx_sz, c->bi.old_idx_sz >> 10,
1449	1445	c->bi.old_idx_sz >> 20);
1450		- dbg_msg("key hash type: %d", c->key_hash_type);
1451		- dbg_msg("tree fanout: %d", c->fanout);
1452		- dbg_msg("reserved GC LEB: %d", c->gc_lnum);
1453		- dbg_msg("first main LEB: %d", c->main_first);
1454		- dbg_msg("max. znode size %d", c->max_znode_sz);
1455		- dbg_msg("max. index node size %d", c->max_idx_node_sz);
1456		- dbg_msg("node sizes: data %zu, inode %zu, dentry %zu",
	1446	+ dbg_gen("key hash type: %d", c->key_hash_type);
	1447	+ dbg_gen("tree fanout: %d", c->fanout);
	1448	+ dbg_gen("reserved GC LEB: %d", c->gc_lnum);
	1449	+ dbg_gen("max. znode size %d", c->max_znode_sz);
	1450	+ dbg_gen("max. index node size %d", c->max_idx_node_sz);
	1451	+ dbg_gen("node sizes: data %zu, inode %zu, dentry %zu",
1457	1452	UBIFS_DATA_NODE_SZ, UBIFS_INO_NODE_SZ, UBIFS_DENT_NODE_SZ);
1458		- dbg_msg("node sizes: trun %zu, sb %zu, master %zu",
	1453	+ dbg_gen("node sizes: trun %zu, sb %zu, master %zu",
1459	1454	UBIFS_TRUN_NODE_SZ, UBIFS_SB_NODE_SZ, UBIFS_MST_NODE_SZ);
1460		- dbg_msg("node sizes: ref %zu, cmt. start %zu, orph %zu",
	1455	+ dbg_gen("node sizes: ref %zu, cmt. start %zu, orph %zu",
1461	1456	UBIFS_REF_NODE_SZ, UBIFS_CS_NODE_SZ, UBIFS_ORPH_NODE_SZ);
1462		- dbg_msg("max. node sizes: data %zu, inode %zu dentry %zu, idx %d",
	1457	+ dbg_gen("max. node sizes: data %zu, inode %zu dentry %zu, idx %d",
1463	1458	UBIFS_MAX_DATA_NODE_SZ, UBIFS_MAX_INO_NODE_SZ,
1464	1459	UBIFS_MAX_DENT_NODE_SZ, ubifs_idx_node_sz(c, c->fanout));
1465		- dbg_msg("dead watermark: %d", c->dead_wm);
1466		- dbg_msg("dark watermark: %d", c->dark_wm);
1467		- dbg_msg("LEB overhead: %d", c->leb_overhead);
	1460	+ dbg_gen("dead watermark: %d", c->dead_wm);
	1461	+ dbg_gen("dark watermark: %d", c->dark_wm);
	1462	+ dbg_gen("LEB overhead: %d", c->leb_overhead);
1468	1463	x = (long long)c->main_lebs * c->dark_wm;
1469		- dbg_msg("max. dark space: %lld (%lld KiB, %lld MiB)",
	1464	+ dbg_gen("max. dark space: %lld (%lld KiB, %lld MiB)",
1470	1465	x, x >> 10, x >> 20);
1471		- dbg_msg("maximum bud bytes: %lld (%lld KiB, %lld MiB)",
	1466	+ dbg_gen("maximum bud bytes: %lld (%lld KiB, %lld MiB)",
1472	1467	c->max_bud_bytes, c->max_bud_bytes >> 10,
1473	1468	c->max_bud_bytes >> 20);
1474		- dbg_msg("BG commit bud bytes: %lld (%lld KiB, %lld MiB)",
	1469	+ dbg_gen("BG commit bud bytes: %lld (%lld KiB, %lld MiB)",
1475	1470	c->bg_bud_bytes, c->bg_bud_bytes >> 10,
1476	1471	c->bg_bud_bytes >> 20);
1477		- dbg_msg("current bud bytes %lld (%lld KiB, %lld MiB)",
	1472	+ dbg_gen("current bud bytes %lld (%lld KiB, %lld MiB)",
1478	1473	c->bud_bytes, c->bud_bytes >> 10, c->bud_bytes >> 20);
1479		- dbg_msg("max. seq. number: %llu", c->max_sqnum);
1480		- dbg_msg("commit number: %llu", c->cmt_no);
	1474	+ dbg_gen("max. seq. number: %llu", c->max_sqnum);
	1475	+ dbg_gen("commit number: %llu", c->cmt_no);
1481	1476
1482	1477	return 0;
1483	1478
...	...	@@ -328,8 +328,8 @@
328	328	case UBIFS_XENT_KEY:
329	329	break;
330	330	default:
331		- dbg_msg("bad key type at slot %d: %d",
332		- i, key_type(c, &zbr->key));
	331	+ ubifs_err("bad key type at slot %d: %d",
	332	+ i, key_type(c, &zbr->key));
333	333	err = 3;
334	334	goto out_dump;
335	335	}