Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 11 insertions, 7 deletions

diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index e42afab9a9fe..366eb70219a6 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -28,7 +28,7 @@
 #include <linux/slab.h>
 #include "ubi.h"
 
-#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID
+#ifdef CONFIG_MTD_UBI_DEBUG
 static int paranoid_check_volumes(struct ubi_device *ubi);
 #else
 #define paranoid_check_volumes(ubi) 0
@@ -261,6 +261,9 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
         /* Reserve physical eraseblocks */
         if (vol->reserved_pebs > ubi->avail_pebs) {
                 dbg_err("not enough PEBs, only %d available", ubi->avail_pebs);
+                if (ubi->corr_peb_count)
+                        dbg_err("%d PEBs are corrupted and not used",
+                                ubi->corr_peb_count);
                 err = -ENOSPC;
                 goto out_unlock;
         }
@@ -527,6 +530,9 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs)
                 if (pebs > ubi->avail_pebs) {
                         dbg_err("not enough PEBs: requested %d, available %d",
                                 pebs, ubi->avail_pebs);
+                        if (ubi->corr_peb_count)
+                                dbg_err("%d PEBs are corrupted and not used",
+                                        ubi->corr_peb_count);
                         spin_unlock(&ubi->volumes_lock);
                         err = -ENOSPC;
                         goto out_free;
@@ -705,7 +711,7 @@ void ubi_free_volume(struct ubi_device *ubi, struct ubi_volume *vol)
         volume_sysfs_close(vol);
 }
 
-#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID
+#ifdef CONFIG_MTD_UBI_DEBUG
 
 /**
  * paranoid_check_volume - check volume information.
@@ -784,11 +790,6 @@ static int paranoid_check_volume(struct ubi_device *ubi, int vol_id)
                 goto fail;
         }
 
-        if (!vol->name) {
-                ubi_err("NULL volume name");
-                goto fail;
-        }
-
         n = strnlen(vol->name, vol->name_len + 1);
         if (n != vol->name_len) {
                 ubi_err("bad name_len %lld", n);
@@ -870,6 +871,9 @@ static int paranoid_check_volumes(struct ubi_device *ubi)
 {
         int i, err = 0;
 
+        if (!(ubi_chk_flags & UBI_CHK_GEN))
+                return 0;
+
         for (i = 0; i < ubi->vtbl_slots; i++) {
                 err = paranoid_check_volume(ubi, i);
                 if (err)