Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 28 insertions, 3 deletions

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 144e6b613a77..29675edb44b4 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -48,8 +48,11 @@ static int part_read(struct mtd_info *mtd, loff_t from, size_t len,
                 size_t *retlen, u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
+        struct mtd_ecc_stats stats;
         int res;
 
+        stats = part->master->ecc_stats;
+
         if (from >= mtd->size)
                 len = 0;
         else if (from + len > mtd->size)
@@ -58,9 +61,9 @@ static int part_read(struct mtd_info *mtd, loff_t from, size_t len,
                                    len, retlen, buf);
         if (unlikely(res)) {
                 if (res == -EUCLEAN)
-                        mtd->ecc_stats.corrected++;
+                        mtd->ecc_stats.corrected += part->master->ecc_stats.corrected - stats.corrected;
                 if (res == -EBADMSG)
-                        mtd->ecc_stats.failed++;
+                        mtd->ecc_stats.failed += part->master->ecc_stats.failed - stats.failed;
         }
         return res;
 }
@@ -84,6 +87,18 @@ static void part_unpoint(struct mtd_info *mtd, loff_t from, size_t len)
         part->master->unpoint(part->master, from + part->offset, len);
 }
 
+static unsigned long part_get_unmapped_area(struct mtd_info *mtd,
+                                            unsigned long len,
+                                            unsigned long offset,
+                                            unsigned long flags)
+{
+        struct mtd_part *part = PART(mtd);
+
+        offset += part->offset;
+        return part->master->get_unmapped_area(part->master, len, offset,
+                                               flags);
+}
+
 static int part_read_oob(struct mtd_info *mtd, loff_t from,
                 struct mtd_oob_ops *ops)
 {
@@ -342,6 +357,12 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
 
         slave->mtd.name = part->name;
         slave->mtd.owner = master->owner;
+        slave->mtd.backing_dev_info = master->backing_dev_info;
+
+        /* NOTE:  we don't arrange MTDs as a tree; it'd be error-prone
+         * to have the same data be in two different partitions.
+         */
+        slave->mtd.dev.parent = master->dev.parent;
 
         slave->mtd.read = part_read;
         slave->mtd.write = part_write;
@@ -354,6 +375,8 @@ static struct mtd_part *add_one_partition(struct mtd_info *master,
                 slave->mtd.unpoint = part_unpoint;
         }
 
+        if (master->get_unmapped_area)
+                slave->mtd.get_unmapped_area = part_get_unmapped_area;
         if (master->read_oob)
                 slave->mtd.read_oob = part_read_oob;
         if (master->write_oob)
@@ -493,7 +516,9 @@ out_register:
  * This function, given a master MTD object and a partition table, creates
  * and registers slave MTD objects which are bound to the master according to
  * the partition definitions.
- * (Q: should we register the master MTD object as well?)
+ *
+ * We don't register the master, or expect the caller to have done so,
+ * for reasons of data integrity.
  */
 
 int add_mtd_partitions(struct mtd_info *master,