| From 7c7feb2ebfc9c0552c51f0c050db1d1a004faac5 Mon Sep 17 00:00:00 2001 |
| From: shengyong <shengyong1@huawei.com> |
| Date: Mon, 28 Sep 2015 17:57:19 +0000 |
| Subject: UBI: return ENOSPC if no enough space available |
| |
| commit 7c7feb2ebfc9c0552c51f0c050db1d1a004faac5 upstream. |
| |
| UBI: attaching mtd1 to ubi0 |
| UBI: scanning is finished |
| UBI error: init_volumes: not enough PEBs, required 706, available 686 |
| UBI error: ubi_wl_init: no enough physical eraseblocks (-20, need 1) |
| UBI error: ubi_attach_mtd_dev: failed to attach mtd1, error -12 <= NOT ENOMEM |
| UBI error: ubi_init: cannot attach mtd1 |
| |
| If available PEBs are not enough when initializing volumes, return -ENOSPC |
| directly. If available PEBs are not enough when initializing WL, return |
| -ENOSPC instead of -ENOMEM. |
| |
| Signed-off-by: Sheng Yong <shengyong1@huawei.com> |
| Signed-off-by: Richard Weinberger <richard@nod.at> |
| Reviewed-by: David Gstir <david@sigma-star.at> |
| Signed-off-by: Zefan Li <lizefan@huawei.com> |
| --- |
| drivers/mtd/ubi/vtbl.c | 1 + |
| drivers/mtd/ubi/wl.c | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| --- a/drivers/mtd/ubi/vtbl.c |
| +++ b/drivers/mtd/ubi/vtbl.c |
| @@ -656,6 +656,7 @@ static int init_volumes(struct ubi_devic |
| if (ubi->corr_peb_count) |
| ubi_err("%d PEBs are corrupted and not used", |
| ubi->corr_peb_count); |
| + return -ENOSPC; |
| } |
| ubi->rsvd_pebs += reserved_pebs; |
| ubi->avail_pebs -= reserved_pebs; |
| --- a/drivers/mtd/ubi/wl.c |
| +++ b/drivers/mtd/ubi/wl.c |
| @@ -1513,6 +1513,7 @@ int ubi_wl_init_scan(struct ubi_device * |
| if (ubi->corr_peb_count) |
| ubi_err("%d PEBs are corrupted and not used", |
| ubi->corr_peb_count); |
| + err = -ENOSPC; |
| goto out_free; |
| } |
| ubi->avail_pebs -= WL_RESERVED_PEBS; |
