The NAND layer is now able to forward power-cut emulation errors from a NAND driver to the MTD user. Check for this kind of errors in UBI and switch the UBI device in read-only mode if such an error occurs. The error will also be forwarded to the UBI user requesting the operation if any, thus allowing UBIFS to act accordingly.
Signed-off-by: Boris Brezillon <boris.brezil...@free-electrons.com> --- drivers/mtd/ubi/io.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index 5bbd1f0..c5ebef7 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -303,6 +303,8 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset, len = ubi->peb_size - offset; if (len) err = ubi_self_check_all_ff(ubi, pnum, offset, len); + } else if (err == -EROFS) { + ubi_ro_mode(ubi); } return err; @@ -355,7 +357,7 @@ retry: err = mtd_erase(ubi->mtd, &ei); if (err) { - if (retries++ < UBI_IO_RETRIES) { + if (err != -EROFS && retries++ < UBI_IO_RETRIES) { ubi_warn(ubi, "error %d while erasing PEB %d, retry", err, pnum); yield(); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/