Commit 19495f70 authored by Anatolij Gustschin's avatar Anatolij Gustschin Committed by Artem Bityutskiy

UBIFS: fix master node recovery

When the 1st LEB was unmapped and written but 2nd LEB not,
the master node recovery doesn't succeed after power cut.
We see following error when mounting UBIFS partition on NOR
flash:

UBIFS error (pid 1137): ubifs_recover_master_node: failed to recover master node

Correct 2nd master node offset check is needed to fix the
problem. If the 2nd master node is at the end in the 2nd LEB,
first master node is used for recovery. When checking for this
condition we should check whether the master node is exactly at
the end of the LEB (without remaining empty space) or whether
it is followed by an empty space less than the master node size.

Artem: when the error happened, offs2 = 261120, sz = 512, c->leb_size = 262016.
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
Signed-off-by: default avatarArtem Bityutskiy <dedekind1@gmail.com>
parent a7fa94a9
...@@ -274,7 +274,8 @@ int ubifs_recover_master_node(struct ubifs_info *c) ...@@ -274,7 +274,8 @@ int ubifs_recover_master_node(struct ubifs_info *c)
if (cor1) if (cor1)
goto out_err; goto out_err;
mst = mst1; mst = mst1;
} else if (offs1 == 0 && offs2 + sz >= c->leb_size) { } else if (offs1 == 0 &&
c->leb_size - offs2 - sz < sz) {
/* 1st LEB was unmapped and written, 2nd not */ /* 1st LEB was unmapped and written, 2nd not */
if (cor1) if (cor1)
goto out_err; goto out_err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment