@@ -433,6 +433,7 @@ int main(int argc, char *argv[])
* Step 1: Read master & init lpt
* Step 2: Replay journal
* Step 3: Handle orphan nodes
+ * Step 4: Consolidate log
*/
err = ubifs_load_filesystem(c);
if (err) {
@@ -199,6 +199,32 @@ int ubifs_load_filesystem(struct ubifs_info *c)
goto out_orphans;
}
+ if (!c->ro_mount) {
+ int lnum;
+
+ /* Check for enough log space */
+ lnum = c->lhead_lnum + 1;
+ if (lnum >= UBIFS_LOG_LNUM + c->log_lebs)
+ lnum = UBIFS_LOG_LNUM;
+ if (lnum == c->ltail_lnum) {
+ log_out(c, "Consolidate log");
+ err = ubifs_consolidate_log(c);
+ if (err) {
+ unsigned int reason = get_failure_reason_callback(c);
+
+ clear_failure_reason_callback(c);
+ if (reason & FR_DATA_CORRUPTED) {
+ if (fix_problem(c, LOG_CORRUPTED, NULL))
+ FSCK(c)->try_rebuild = true;
+ } else {
+ ubifs_assert(c, reason == 0);
+ exit_code |= FSCK_ERROR;
+ }
+ goto out_orphans;
+ }
+ }
+ }
+
c->mounting = 0;
return 0;
@@ -711,6 +711,7 @@ int ubifs_consolidate_log(struct ubifs_info *c)
destroy_done_tree(&done_tree);
vfree(buf);
if (write_lnum == c->lhead_lnum) {
+ set_failure_reason_callback(c, FR_DATA_CORRUPTED);
ubifs_err(c, "log is too full");
return -EINVAL;
}
This is the 4/18 step of fsck. Consolidate log to ensure enough space in log area. There could be following possible errors: 1. corrupted scanning data in log area: danger mode with rebuild_fs and normal mode with 'yes' answer will turn to rebuild filesystem, other modes will exit. Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com> --- ubifs-utils/fsck.ubifs/fsck.ubifs.c | 1 + ubifs-utils/fsck.ubifs/load_fs.c | 26 ++++++++++++++++++++++++++ ubifs-utils/libubifs/log.c | 1 + 3 files changed, 28 insertions(+)