UBI: Fastmap: Wire up WL accessor functions

Use the new WL accessor functions in fastmap.

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

1 files changed, 12 insertions, 16 deletions

diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 13492fef6471..02a6de2f53ee 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -1087,11 +1087,11 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
         struct ubi_fm_ec *fec;
         struct ubi_fm_volhdr *fvh;
         struct ubi_fm_eba *feba;
-        struct rb_node *node;
         struct ubi_wl_entry *wl_e;
         struct ubi_volume *vol;
         struct ubi_vid_hdr *avhdr, *dvhdr;
         struct ubi_work *ubi_wrk;
+        struct rb_node *tmp_rb;
         int ret, i, j, free_peb_count, used_peb_count, vol_count;
         int scrub_peb_count, erase_peb_count;
         int *seen_pebs = NULL;
@@ -1163,8 +1163,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
                 set_seen(ubi, ubi->fm_wl_pool.pebs[i], seen_pebs);
         }
 
-        for (node = rb_first(&ubi->free); node; node = rb_next(node)) {
-                wl_e = rb_entry(node, struct ubi_wl_entry, u.rb);
+        ubi_for_each_free_peb(ubi, wl_e, tmp_rb) {
                 fec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
 
                 fec->pnum = cpu_to_be32(wl_e->pnum);
@@ -1177,8 +1176,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
         }
         fmh->free_peb_count = cpu_to_be32(free_peb_count);
 
-        for (node = rb_first(&ubi->used); node; node = rb_next(node)) {
-                wl_e = rb_entry(node, struct ubi_wl_entry, u.rb);
+        ubi_for_each_used_peb(ubi, wl_e, tmp_rb) {
                 fec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
 
                 fec->pnum = cpu_to_be32(wl_e->pnum);
@@ -1190,22 +1188,20 @@ static int ubi_write_fastmap(struct ubi_device *ubi,
                 ubi_assert(fm_pos <= ubi->fm_size);
         }
 
-        for (i = 0; i < UBI_PROT_QUEUE_LEN; i++) {
-                list_for_each_entry(wl_e, &ubi->pq[i], u.list) {
-                        fec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
+        ubi_for_each_protected_peb(ubi, i, wl_e) {
+                fec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
 
-                        fec->pnum = cpu_to_be32(wl_e->pnum);
-                        fec->ec = cpu_to_be32(wl_e->ec);
+                fec->pnum = cpu_to_be32(wl_e->pnum);
+                set_seen(ubi, wl_e->pnum, seen_pebs);
+                fec->ec = cpu_to_be32(wl_e->ec);
 
-                        used_peb_count++;
-                        fm_pos += sizeof(*fec);
-                        ubi_assert(fm_pos <= ubi->fm_size);
-                }
+                used_peb_count++;
+                fm_pos += sizeof(*fec);
+                ubi_assert(fm_pos <= ubi->fm_size);
         }
         fmh->used_peb_count = cpu_to_be32(used_peb_count);
 
-        for (node = rb_first(&ubi->scrub); node; node = rb_next(node)) {
-                wl_e = rb_entry(node, struct ubi_wl_entry, u.rb);
+        ubi_for_each_scrub_peb(ubi, wl_e, tmp_rb) {
                 fec = (struct ubi_fm_ec *)(fm_raw + fm_pos);
 
                 fec->pnum = cpu_to_be32(wl_e->pnum);