7 files changed, 24 insertions, 11 deletions

diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index b1fc28f63882..d0b63bbf46a7 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -244,7 +244,7 @@ static int ubiblock_open(struct block_device *bdev, fmode_t mode)
          * in any case.
          */
         if (mode & FMODE_WRITE) {
-                ret = -EPERM;
+                ret = -EROFS;
                 goto out_unlock;
         }
 
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index e941395de3ae..753494e042d5 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -854,6 +854,17 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
                 return -EINVAL;
         }
 
+        /*
+         * Both UBI and UBIFS have been designed for SLC NAND and NOR flashes.
+         * MLC NAND is different and needs special care, otherwise UBI or UBIFS
+         * will die soon and you will lose all your data.
+         */
+        if (mtd->type == MTD_MLCNANDFLASH) {
+                pr_err("ubi: refuse attaching mtd%d - MLC NAND is not supported\n",
+                        mtd->index);
+                return -EINVAL;
+        }
+
         if (ubi_num == UBI_DEV_NUM_AUTO) {
                 /* Search for an empty slot in the @ubi_devices array */
                 for (ubi_num = 0; ubi_num < UBI_MAX_DEVICES; ubi_num++)
diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c
index 590d967011bb..98f7d6be8d1f 100644
--- a/drivers/mtd/ubi/fastmap-wl.c
+++ b/drivers/mtd/ubi/fastmap-wl.c
@@ -362,7 +362,6 @@ static void ubi_fastmap_close(struct ubi_device *ubi)
 {
         int i;
 
-        flush_work(&ubi->fm_work);
         return_unused_pool_pebs(ubi, &ubi->fm_pool);
         return_unused_pool_pebs(ubi, &ubi->fm_wl_pool);
 
diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c
index 2dcf3d473fec..9571616b5dda 100644
--- a/fs/ubifs/find.c
+++ b/fs/ubifs/find.c
@@ -632,7 +632,7 @@ static int scan_for_idx_cb(struct ubifs_info *c,
  */
 static const struct ubifs_lprops *scan_for_leb_for_idx(struct ubifs_info *c)
 {
-        struct ubifs_lprops *lprops;
+        const struct ubifs_lprops *lprops;
         struct scan_data data;
         int err;
 
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index 6c3a1abd0e22..f5a46844340c 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -244,7 +244,6 @@ static void remove_from_lpt_heap(struct ubifs_info *c,
 /**
  * lpt_heap_replace - replace lprops in a category heap.
  * @c: UBIFS file-system description object
- * @old_lprops: LEB properties to replace
  * @new_lprops: LEB properties with which to replace
  * @cat: LEB category
  *
@@ -254,7 +253,6 @@ static void remove_from_lpt_heap(struct ubifs_info *c,
  * lprops.  This function does that.
  */
 static void lpt_heap_replace(struct ubifs_info *c,
-                             struct ubifs_lprops *old_lprops,
                              struct ubifs_lprops *new_lprops, int cat)
 {
         struct ubifs_lpt_heap *heap;
@@ -362,7 +360,7 @@ void ubifs_replace_cat(struct ubifs_info *c, struct ubifs_lprops *old_lprops,
         case LPROPS_DIRTY:
         case LPROPS_DIRTY_IDX:
         case LPROPS_FREE:
-                lpt_heap_replace(c, old_lprops, new_lprops, cat);
+                lpt_heap_replace(c, new_lprops, cat);
                 break;
         case LPROPS_UNCAT:
         case LPROPS_EMPTY:
diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index aab87340d3de..16f03d9929e5 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -175,7 +175,6 @@ struct ubifs_scan_leb *ubifs_start_scan(const struct ubifs_info *c, int lnum,
 void ubifs_end_scan(const struct ubifs_info *c, struct ubifs_scan_leb *sleb,
                     int lnum, int offs)
 {
-        lnum = lnum;
         dbg_scan("stop scanning LEB %d at offset %d", lnum, offs);
         ubifs_assert(offs % c->min_io_size == 0);
 
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index b16ef162344a..6c397a389105 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1737,8 +1737,11 @@ static void ubifs_remount_ro(struct ubifs_info *c)
 
         dbg_save_space_info(c);
 
-        for (i = 0; i < c->jhead_cnt; i++)
-                ubifs_wbuf_sync(&c->jheads[i].wbuf);
+        for (i = 0; i < c->jhead_cnt; i++) {
+                err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
+                if (err)
+                        ubifs_ro_mode(c, err);
+        }
 
         c->mst_node->flags &= ~cpu_to_le32(UBIFS_MST_DIRTY);
         c->mst_node->flags |= cpu_to_le32(UBIFS_MST_NO_ORPHS);
@@ -1804,8 +1807,11 @@ static void ubifs_put_super(struct super_block *sb)
                         int err;
 
                         /* Synchronize write-buffers */
-                        for (i = 0; i < c->jhead_cnt; i++)
-                                ubifs_wbuf_sync(&c->jheads[i].wbuf);
+                        for (i = 0; i < c->jhead_cnt; i++) {
+                                err = ubifs_wbuf_sync(&c->jheads[i].wbuf);
+                                if (err)
+                                        ubifs_ro_mode(c, err);
+                        }
 
                         /*
                          * We are being cleanly unmounted which means the