diff options
author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-08-25 08:00:55 -0400 |
---|---|---|
committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-10 05:06:47 -0400 |
commit | 348709bad348d2fd013e1529b4cf5f220717c328 (patch) | |
tree | e5ba0fb86c1c41d078c38f6ca67bda957241ef53 /fs/ubifs/recovery.c | |
parent | e3c3efc243462d67ba9fa7f67620dcbc4597bf0a (diff) |
UBIFS: do not print scary error messages needlessly
At the moment UBIFS print large and scary error messages and
flash dumps in case of nearly any corruption, even if it is
a recoverable corruption. For example, if the master node is
corrupted, ubifs_scan() prints error dumps, then UBIFS recovers
just fine and goes on.
This patch makes UBIFS print scary error messages only in
real cases, which are not recoverable. It adds 'quiet' argument
to the 'ubifs_scan()' function, so the caller may ask 'ubi_scan()'
not to print error messages if the caller is able to do recovery.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Reviewed-by: Adrian Hunter <Adrian.Hunter@nokia.com>
Diffstat (limited to 'fs/ubifs/recovery.c')
-rw-r--r-- | fs/ubifs/recovery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index e5f6cf8a1155..f94ddf7efba0 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c | |||
@@ -286,7 +286,7 @@ int ubifs_recover_master_node(struct ubifs_info *c) | |||
286 | mst = mst2; | 286 | mst = mst2; |
287 | } | 287 | } |
288 | 288 | ||
289 | dbg_rcvry("recovered master node from LEB %d", | 289 | ubifs_msg("recovered master node from LEB %d", |
290 | (mst == mst1 ? UBIFS_MST_LNUM : UBIFS_MST_LNUM + 1)); | 290 | (mst == mst1 ? UBIFS_MST_LNUM : UBIFS_MST_LNUM + 1)); |
291 | 291 | ||
292 | memcpy(c->mst_node, mst, UBIFS_MST_NODE_SZ); | 292 | memcpy(c->mst_node, mst, UBIFS_MST_NODE_SZ); |
@@ -790,7 +790,7 @@ struct ubifs_scan_leb *ubifs_recover_log_leb(struct ubifs_info *c, int lnum, | |||
790 | * We can only recover at the end of the log, so check that the | 790 | * We can only recover at the end of the log, so check that the |
791 | * next log LEB is empty or out of date. | 791 | * next log LEB is empty or out of date. |
792 | */ | 792 | */ |
793 | sleb = ubifs_scan(c, next_lnum, 0, sbuf); | 793 | sleb = ubifs_scan(c, next_lnum, 0, sbuf, 0); |
794 | if (IS_ERR(sleb)) | 794 | if (IS_ERR(sleb)) |
795 | return sleb; | 795 | return sleb; |
796 | if (sleb->nodes_cnt) { | 796 | if (sleb->nodes_cnt) { |