Merge tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi

[sfrench/cifs-2.6.git] / drivers / mtd / ubi / wl.c

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index c687538a8e3b74ad5735b6af20a3cf376db6546f..5df49d3cb5c7c05e7644bd9e534950b070336d5b 100644 (file)
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -497,7 +497,7 @@ out:
  * @ubi: UBI device description object
  *
  * This function returns a physical eraseblock in case of success and a
  * @ubi: UBI device description object
  *
  * This function returns a physical eraseblock in case of success and a

- * negative error code in case of failure. Might sleep.
+ * negative error code in case of failure.

  */
 static int __wl_get_peb(struct ubi_device *ubi)
 {
  */
 static int __wl_get_peb(struct ubi_device *ubi)
 {


@@ -539,13 +539,6 @@ retry:
         * ubi_wl_get_peb() after removing e from the pool. */
        prot_queue_add(ubi, e);
 #endif
         * ubi_wl_get_peb() after removing e from the pool. */
        prot_queue_add(ubi, e);
 #endif

-       err = ubi_self_check_all_ff(ubi, e->pnum, ubi->vid_hdr_aloffset,
-                                   ubi->peb_size - ubi->vid_hdr_aloffset);
-       if (err) {
-               ubi_err("new PEB %d does not contain all 0xFF bytes", e->pnum);
-               return err;
-       }
-

        return e->pnum;
 }
 
        return e->pnum;
 }
 


@@ -678,17 +671,30 @@ static struct ubi_wl_entry *get_peb_for_wl(struct ubi_device *ubi)
 #else
 static struct ubi_wl_entry *get_peb_for_wl(struct ubi_device *ubi)
 {
 #else
 static struct ubi_wl_entry *get_peb_for_wl(struct ubi_device *ubi)
 {

-       return find_wl_entry(ubi, &ubi->free, WL_FREE_MAX_DIFF);
+       struct ubi_wl_entry *e;
+
+       e = find_wl_entry(ubi, &ubi->free, WL_FREE_MAX_DIFF);
+       self_check_in_wl_tree(ubi, e, &ubi->free);
+       rb_erase(&e->u.rb, &ubi->free);
+
+       return e;

 }
 
 int ubi_wl_get_peb(struct ubi_device *ubi)
 {
 }
 
 int ubi_wl_get_peb(struct ubi_device *ubi)
 {

-       int peb;
+       int peb, err;

 
        spin_lock(&ubi->wl_lock);
        peb = __wl_get_peb(ubi);
        spin_unlock(&ubi->wl_lock);
 
 
        spin_lock(&ubi->wl_lock);
        peb = __wl_get_peb(ubi);
        spin_unlock(&ubi->wl_lock);
 

+       err = ubi_self_check_all_ff(ubi, peb, ubi->vid_hdr_aloffset,
+                                   ubi->peb_size - ubi->vid_hdr_aloffset);
+       if (err) {
+               ubi_err("new PEB %d does not contain all 0xFF bytes", peb);
+               return err;
+       }
+

        return peb;
 }
 #endif
        return peb;
 }
 #endif