UBI: Fastmap: Introduce ubi_fastmap_init()

...and kill another #ifdef in wl.c. :-)

Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 7d49f42ca2d5c474f1b0d5b14aba7f1c8b0eae6a..c56c7a16c03bbc764cd046ff37a569f4c6b86522 100644 (file)
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1510,9 +1510,6 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
        init_rwsem(&ubi->work_sem);
        ubi->max_ec = ai->max_ec;
        INIT_LIST_HEAD(&ubi->works);
-#ifdef CONFIG_MTD_UBI_FASTMAP
-       INIT_WORK(&ubi->fm_work, update_fastmap_work_fn);
-#endif
 
        sprintf(ubi->bgt_name, UBI_BGT_NAME_PATTERN, ubi->ubi_num);
 
@@ -1606,10 +1603,7 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
                ubi_assert(ubi->good_peb_count == found_pebs);
 
        reserved_pebs = WL_RESERVED_PEBS;
-#ifdef CONFIG_MTD_UBI_FASTMAP
-       /* Reserve enough LEBs to store two fastmaps. */
-       reserved_pebs += (ubi->fm_size / ubi->leb_size) * 2;
-#endif
+       ubi_fastmap_init(ubi, &reserved_pebs);
 
        if (ubi->avail_pebs < reserved_pebs) {
                ubi_err(ubi, "no enough physical eraseblocks (%d, need %d)",

diff --git a/drivers/mtd/ubi/wl.h b/drivers/mtd/ubi/wl.h
index db8681477d9696b26260d0823e708db50299c487..4046ccf8942b1d3bebbd51710b33b3ec072861f2 100644 (file)
--- a/drivers/mtd/ubi/wl.h
+++ b/drivers/mtd/ubi/wl.h
@@ -7,6 +7,12 @@ static void update_fastmap_work_fn(struct work_struct *wrk);
 static struct ubi_wl_entry *find_anchor_wl_entry(struct rb_root *root);
 static struct ubi_wl_entry *get_peb_for_wl(struct ubi_device *ubi);
 static void ubi_fastmap_close(struct ubi_device *ubi);
+static inline void ubi_fastmap_init(struct ubi_device *ubi, int *count)
+{
+       /* Reserve enough LEBs to store two fastmaps. */
+       *count += (ubi->fm_size / ubi->leb_size) * 2;
+       INIT_WORK(&ubi->fm_work, update_fastmap_work_fn);
+}
 #else /* !CONFIG_MTD_UBI_FASTMAP */
 static struct ubi_wl_entry *get_peb_for_wl(struct ubi_device *ubi);
 static inline int is_fm_block(struct ubi_device *ubi, int pnum)
@@ -14,5 +20,6 @@ static inline int is_fm_block(struct ubi_device *ubi, int pnum)
        return 0;
 }
 static inline void ubi_fastmap_close(struct ubi_device *ubi) { }
+static inline void ubi_fastmap_init(struct ubi_device *ubi, int *count) { }
 #endif /* CONFIG_MTD_UBI_FASTMAP */
 #endif /* UBI_WL_H */