lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UBI: fix backward compatibility

Browse Source 
Commit 32bc482028 did not fully fix
the backward compatibility issues. We still fail to properly handle
situations when the first PEB contains non-zero image sequence
number, but one of the following PEBs contains zero image sequence
number. For example, this may happen if we mount a new image with
an old kernel, and then try to mount it in the new kernel.

This patch should fix the issue.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Artem Bityutskiy
2009-09-30 10:01:28 +03:00
parent 012abeea66
commit 2eadaad67b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/ubi/scan.c
View File

@@ -794,16 +794,15 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
* number. * number.
*/ */
image_seq = be32_to_cpu(ech->image_seq); image_seq = be32_to_cpu(ech->image_seq);
if (!si->image_seq_set) { if (!ubi->image_seq && image_seq)
ubi->image_seq = image_seq; ubi->image_seq = image_seq;
si->image_seq_set = 1; if (ubi->image_seq && image_seq &&
} else if (ubi->image_seq && ubi->image_seq != image_seq) { ubi->image_seq != image_seq) {
ubi_err("bad image sequence number %d in PEB %d, " ubi_err("bad image sequence number %d in PEB %d, "
"expected %d", image_seq, pnum, ubi->image_seq); "expected %d", image_seq, pnum, ubi->image_seq);
ubi_dbg_dump_ec_hdr(ech); ubi_dbg_dump_ec_hdr(ech);
return -EINVAL; return -EINVAL;
} }
} }
/* OK, we've done with the EC header, let's look at the VID header */ /* OK, we've done with the EC header, let's look at the VID header */

2
drivers/mtd/ubi/scan.h
View File

@@ -103,7 +103,6 @@ struct ubi_scan_volume {
* @ec_sum: a temporary variable used when calculating @mean_ec * @ec_sum: a temporary variable used when calculating @mean_ec
* @ec_count: a temporary variable used when calculating @mean_ec * @ec_count: a temporary variable used when calculating @mean_ec
* @corr_count: count of corrupted PEBs * @corr_count: count of corrupted PEBs
* @image_seq_set: indicates @ubi->image_seq is known
* *
* This data structure contains the result of scanning and may be used by other * This data structure contains the result of scanning and may be used by other
* UBI sub-systems to build final UBI data structures, further error-recovery * UBI sub-systems to build final UBI data structures, further error-recovery
@@ -127,7 +126,6 @@ struct ubi_scan_info {
uint64_t ec_sum; uint64_t ec_sum;
int ec_count; int ec_count;
int corr_count; int corr_count;
int image_seq_set;
}; };
struct ubi_device; struct ubi_device;