Messages in this thread Patch in this message | | | From | Richard Weinberger <> | Subject | [PATCH 04/16] UBI: Fastmap: Rename self_check_fastmap() | Date | Wed, 27 Jun 2012 17:57:44 +0200 |
| |
Signed-off-by: Richard Weinberger <richard@nod.at> --- drivers/mtd/ubi/fastmap.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index ba547e2..a596cef 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -462,7 +462,11 @@ out: return ret; } -static int self_check_fastmap(struct ubi_attach_info *ai) +/** + * count_fastmap_pebs - Counts the PEBs found by fastmap. + * @ai: The UBI attach info object + */ +static int count_fastmap_pebs(struct ubi_attach_info *ai) { struct ubi_ainf_peb *aeb; struct ubi_ainf_volume *av; @@ -1006,7 +1010,7 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai) * We do this here because in ubi_wl_init() it's too late * and we cannot fall back to scanning. */ - if (WARN_ON(self_check_fastmap(ai) != ubi->peb_count - + if (WARN_ON(count_fastmap_pebs(ai) != ubi->peb_count - ai->bad_peb_count - used_blocks)) { ret = UBI_BAD_FASTMAP; kfree(fm); -- 1.7.6.5
| |