]> git.karo-electronics.de Git - linux-beck.git/commitdiff
UBI: Fastmap: Remove is_fm_block()
authorRichard Weinberger <richard@nod.at>
Fri, 7 Nov 2014 12:35:41 +0000 (13:35 +0100)
committerRichard Weinberger <richard@nod.at>
Thu, 26 Mar 2015 21:47:38 +0000 (22:47 +0100)
This function was added to fastmap in a very early stage
to have paranoid assertions.
With the current fastmap implementation this assert will never
trigger as fastmap PEBs are not seen by the WL sub-system.
Remove it to save us some CPU cycles.

Signed-off-by: Richard Weinberger <richard@nod.at>
drivers/mtd/ubi/fastmap-wl.c
drivers/mtd/ubi/wl.c
drivers/mtd/ubi/wl.h

index 067aa9042ec11ff113e3e51693cbc056cb8685cd..b2a665398bcaf41225f6a9cbe858e8df209c3b89 100644 (file)
@@ -28,25 +28,6 @@ static void update_fastmap_work_fn(struct work_struct *wrk)
        spin_unlock(&ubi->wl_lock);
 }
 
-/**
- *  is_fm_block - returns 1 if a PEB is currently used in a fastmap.
- *  @ubi: UBI device description object
- *  @pnum: the to be checked PEB
- */
-static int is_fm_block(struct ubi_device *ubi, int pnum)
-{
-       int i;
-
-       if (!ubi->fm)
-               return 0;
-
-       for (i = 0; i < ubi->fm->used_blocks; i++)
-               if (ubi->fm->e[i]->pnum == pnum)
-                       return 1;
-
-       return 0;
-}
-
 /**
  * find_anchor_wl_entry - find wear-leveling entry to used as anchor PEB.
  * @root: the RB-tree where to look for
index 94ffdeb370c1dc1194ba5485b0f5a986d5248374..16214d3d57a4d7de6201b61cc5a540f28b80b743 100644 (file)
@@ -585,7 +585,6 @@ static int schedule_erase(struct ubi_device *ubi, struct ubi_wl_entry *e,
        struct ubi_work *wl_wrk;
 
        ubi_assert(e);
-       ubi_assert(!is_fm_block(ubi, e->pnum));
 
        dbg_wl("schedule erasure of PEB %d, EC %d, torture %d",
               e->pnum, e->ec, torture);
@@ -1045,8 +1044,6 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk,
        dbg_wl("erase PEB %d EC %d LEB %d:%d",
               pnum, e->ec, wl_wrk->vol_id, wl_wrk->lnum);
 
-       ubi_assert(!is_fm_block(ubi, e->pnum));
-
        err = sync_erase(ubi, e, wl_wrk->torture);
        if (!err) {
                /* Fine, we've erased it successfully */
@@ -1526,7 +1523,6 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
 
                e->pnum = aeb->pnum;
                e->ec = aeb->ec;
-               ubi_assert(!is_fm_block(ubi, e->pnum));
                ubi->lookuptbl[e->pnum] = e;
                if (schedule_erase(ubi, e, aeb->vol_id, aeb->lnum, 0)) {
                        wl_entry_destroy(ubi, e);
@@ -1547,7 +1543,6 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
                e->pnum = aeb->pnum;
                e->ec = aeb->ec;
                ubi_assert(e->ec >= 0);
-               ubi_assert(!is_fm_block(ubi, e->pnum));
 
                wl_tree_add(e, &ubi->free);
                ubi->free_count++;
index fbc2d8e312df3843900f9ef048fa168c55a79839..bd1f07e5ce9a7fbcc0869987f2c25089c6fa9e0e 100644 (file)
@@ -1,7 +1,6 @@
 #ifndef UBI_WL_H
 #define UBI_WL_H
 #ifdef CONFIG_MTD_UBI_FASTMAP
-static int is_fm_block(struct ubi_device *ubi, int pnum);
 static int anchor_pebs_avalible(struct rb_root *root);
 static void update_fastmap_work_fn(struct work_struct *wrk);
 static struct ubi_wl_entry *find_anchor_wl_entry(struct rb_root *root);
@@ -18,10 +17,6 @@ static struct ubi_wl_entry *may_reserve_for_fm(struct ubi_device *ubi,
                                               struct rb_root *root);
 #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)
-{
-       return 0;
-}
 static inline void ubi_fastmap_close(struct ubi_device *ubi) { }
 static inline void ubi_fastmap_init(struct ubi_device *ubi, int *count) { }
 static struct ubi_wl_entry *may_reserve_for_fm(struct ubi_device *ubi,