Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / mtd / ubi / vtbl.c

diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index fd3bf77..4b50a30 100644 (file)
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -307,8 +307,7 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_scan_info *si,
 {
        int err, tries = 0;
        static struct ubi_vid_hdr *vid_hdr;
-       struct ubi_scan_volume *sv;
-       struct ubi_scan_leb *new_seb, *old_seb = NULL;
+       struct ubi_scan_leb *new_seb;
 
        ubi_msg("create volume table (copy #%d)", copy + 1);
 
@@ -316,15 +315,6 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_scan_info *si,
        if (!vid_hdr)
                return -ENOMEM;
 
-       /*
-        * Check if there is a logical eraseblock which would have to contain
-        * this volume table copy was found during scanning. It has to be wiped
-        * out.
-        */
-       sv = ubi_scan_find_sv(si, UBI_LAYOUT_VOLUME_ID);
-       if (sv)
-               old_seb = ubi_scan_find_seb(sv, copy);
-
 retry:
        new_seb = ubi_scan_get_free_peb(ubi, si);
        if (IS_ERR(new_seb)) {
@@ -351,8 +341,8 @@ retry:
                goto write_error;
 
        /*
-        * And add it to the scanning information. Don't delete the old
-        * @old_seb as it will be deleted and freed in 'ubi_scan_add_used()'.
+        * And add it to the scanning information. Don't delete the old version
+        * of this LEB as it will be deleted and freed in 'ubi_scan_add_used()'.
         */
        err = ubi_scan_add_used(ubi, si, new_seb->pnum, new_seb->ec,
                                vid_hdr, 0);
@@ -876,7 +866,7 @@ out_free:
  */
 static void paranoid_vtbl_check(const struct ubi_device *ubi)
 {
-       if (!(ubi_chk_flags & UBI_CHK_GEN))
+       if (!ubi->dbg->chk_gen)
                return;
 
        if (vtbl_check(ubi, ubi->vtbl)) {