Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
mtd
/
ubi
/
fastmap.c
diff --git
a/kernel/drivers/mtd/ubi/fastmap.c
b/kernel/drivers/mtd/ubi/fastmap.c
index
263b439
..
bba7dd1
100644
(file)
--- a/
kernel/drivers/mtd/ubi/fastmap.c
+++ b/
kernel/drivers/mtd/ubi/fastmap.c
@@
-513,10
+513,11
@@
static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,
unsigned long long ec = be64_to_cpu(ech->ec);
unmap_peb(ai, pnum);
dbg_bld("Adding PEB to free: %i", pnum);
unsigned long long ec = be64_to_cpu(ech->ec);
unmap_peb(ai, pnum);
dbg_bld("Adding PEB to free: %i", pnum);
+
if (err == UBI_IO_FF_BITFLIPS)
if (err == UBI_IO_FF_BITFLIPS)
-
add_aeb(ai, free, pnum, ec, 1)
;
- else
-
add_aeb(ai, free, pnum, ec, 0
);
+
scrub = 1
;
+
+
add_aeb(ai, free, pnum, ec, scrub
);
continue;
} else if (err == 0 || err == UBI_IO_BITFLIPS) {
dbg_bld("Found non empty PEB:%i in pool", pnum);
continue;
} else if (err == 0 || err == UBI_IO_BITFLIPS) {
dbg_bld("Found non empty PEB:%i in pool", pnum);
@@
-748,11
+749,11
@@
static int ubi_attach_fastmap(struct ubi_device *ubi,
fmvhdr->vol_type,
be32_to_cpu(fmvhdr->last_eb_bytes));
fmvhdr->vol_type,
be32_to_cpu(fmvhdr->last_eb_bytes));
- if (
!av)
- goto fail_bad;
- if (PTR_ERR(av) == -EINVAL) {
- ubi_err(ubi, "volume (ID %i) already exists",
- fmvhdr->vol_id);
+ if (
IS_ERR(av)) {
+ if (PTR_ERR(av) == -EEXIST)
+ ubi_err(ubi, "volume (ID %i) already exists",
+ fmvhdr->vol_id);
+
goto fail_bad;
}
goto fail_bad;
}
@@
-1058,6
+1059,7
@@
int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,
ubi_msg(ubi, "fastmap WL pool size: %d",
ubi->fm_wl_pool.max_size);
ubi->fm_disabled = 0;
ubi_msg(ubi, "fastmap WL pool size: %d",
ubi->fm_wl_pool.max_size);
ubi->fm_disabled = 0;
+ ubi->fast_attach = 1;
ubi_free_vid_hdr(ubi, vh);
kfree(ech);
ubi_free_vid_hdr(ubi, vh);
kfree(ech);