OpenWrt – Rev 1

Subversion Repositories:
Rev:
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/init.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
 #include <linux/mutex.h>
 #include <linux/mount.h>
 #include <linux/slab.h>
@@ -209,11 +210,12 @@ static void block2mtd_free_device(struct
 }
 
 
-static struct block2mtd_dev *add_device(char *devname, int erase_size)
+static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
 {
        const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
        struct block_device *bdev;
        struct block2mtd_dev *dev;
+       struct mtd_partition *part;
        char *name;
 
        if (!devname)
@@ -257,13 +259,16 @@ static struct block2mtd_dev *add_device(
 
        /* Setup the MTD structure */
        /* make the name contain the block device in */
-       name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
+       if (!mtdname)
+               mtdname = devname;
+       name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
        if (!name)
                goto err_destroy_mutex;
 
+       strcpy(name, mtdname);
        dev->mtd.name = name;
 
-       dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
+       dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK & ~(erase_size - 1);
        dev->mtd.erasesize = erase_size;
        dev->mtd.writesize = 1;
        dev->mtd.writebufsize = PAGE_SIZE;
@@ -276,15 +281,18 @@ static struct block2mtd_dev *add_device(
        dev->mtd.priv = dev;
        dev->mtd.owner = THIS_MODULE;
 
-       if (mtd_device_register(&dev->mtd, NULL, 0)) {
+       part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
+       part->name = name;
+       part->offset = 0;
+       part->size = dev->mtd.size;
+       if (mtd_device_register(&dev->mtd, part, 1)) {
                /* Device didn't get added, so free the entry */
                goto err_destroy_mutex;
        }
        list_add(&dev->list, &blkmtd_device_list);
        pr_info("mtd%d: [%s] erase_size = %dKiB [%d]\n",
                dev->mtd.index,
-               dev->mtd.name + strlen("block2mtd: "),
-               dev->mtd.erasesize >> 10, dev->mtd.erasesize);
+               mtdname, dev->mtd.erasesize >> 10, dev->mtd.erasesize);
        return dev;
 
 err_destroy_mutex:
@@ -353,9 +361,9 @@ static char block2mtd_paramline[80 + 12]
 
 static int block2mtd_setup2(const char *val)
 {
-       char buf[80 + 12]; /* 80 for device, 12 for erase size */
+       char buf[80 + 12 + 80]; /* 80 for device, 12 for erase size, 80 for name */
        char *str = buf;
-       char *token[2];
+       char *token[3];
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;
@@ -368,7 +376,7 @@ static int block2mtd_setup2(const char *
        strcpy(str, val);
        kill_final_newline(str);
 
-       for (i = 0; i < 2; i++)
+       for (i = 0; i < 3; i++)
                token[i] = strsep(&str, ",");
 
        if (str) {
@@ -394,8 +402,10 @@ static int block2mtd_setup2(const char *
                        return 0;
                }
        }
+       if (token[2] && (strlen(token[2]) + 1 > 80))
+               pr_err("mtd device name too long\n");
 
-       add_device(name, erase_size);
+       add_device(name, erase_size, token[2]);
 
        return 0;
 }
@@ -429,7 +439,7 @@ static int block2mtd_setup(const char *v
 
 
 module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
 
 static int __init block2mtd_init(void)
 {