aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.34/060-block2mtd_init.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-03-18 13:40:48 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-03-18 13:40:48 +0000
commita8d84ae94d0d5ebef14916d79cf0f10748e89bf4 (patch)
tree4d10bf83fcf15c10d44674e06b32effe8451234d /target/linux/generic/patches-2.6.34/060-block2mtd_init.patch
parentde69f84399125d33f593c1a2245ca9ff886b0ae7 (diff)
downloadupstream-a8d84ae94d0d5ebef14916d79cf0f10748e89bf4.tar.gz
upstream-a8d84ae94d0d5ebef14916d79cf0f10748e89bf4.tar.bz2
upstream-a8d84ae94d0d5ebef14916d79cf0f10748e89bf4.zip
remove 2.6.34 support
SVN-Revision: 26229
Diffstat (limited to 'target/linux/generic/patches-2.6.34/060-block2mtd_init.patch')
-rw-r--r--target/linux/generic/patches-2.6.34/060-block2mtd_init.patch120
1 files changed, 0 insertions, 120 deletions
diff --git a/target/linux/generic/patches-2.6.34/060-block2mtd_init.patch b/target/linux/generic/patches-2.6.34/060-block2mtd_init.patch
deleted file mode 100644
index d2890c3e7f..0000000000
--- a/target/linux/generic/patches-2.6.34/060-block2mtd_init.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/drivers/mtd/devices/block2mtd.c
-+++ b/drivers/mtd/devices/block2mtd.c
-@@ -14,6 +14,7 @@
- #include <linux/list.h>
- #include <linux/init.h>
- #include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/buffer_head.h>
- #include <linux/mutex.h>
- #include <linux/mount.h>
-@@ -233,10 +234,11 @@ static void block2mtd_free_device(struct
-
-
- /* FIXME: ensure that mtd->size % erase_size == 0 */
--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)
- {
- struct block_device *bdev;
- struct block2mtd_dev *dev;
-+ struct mtd_partition *part;
- char *name;
-
- if (!devname)
-@@ -274,17 +276,17 @@ static struct block2mtd_dev *add_device(
-
- mutex_init(&dev->write_mutex);
-
-- /* Setup the MTD structure */
-- /* make the name contain the block device in */
-- name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
-- GFP_KERNEL);
-+ if (!mtdname)
-+ mtdname = devname;
-+
-+ name = kmalloc(strlen(mtdname) + 1, GFP_KERNEL);
- if (!name)
- goto devinit_err;
-
-- sprintf(name, "block2mtd: %s", devname);
-+ 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.type = MTD_RAM;
-@@ -297,14 +299,17 @@ static struct block2mtd_dev *add_device(
- dev->mtd.priv = dev;
- dev->mtd.owner = THIS_MODULE;
-
-- if (add_mtd_device(&dev->mtd)) {
-+ part = kzalloc(sizeof(struct mtd_partition), GFP_KERNEL);
-+ part->name = dev->mtd.name;
-+ part->offset = 0;
-+ part->size = dev->mtd.size;
-+ if (add_mtd_partitions(&dev->mtd, part, 1)) {
- /* Device didnt get added, so free the entry */
- goto devinit_err;
- }
- list_add(&dev->list, &blkmtd_device_list);
- INFO("mtd%d: [%s] erase_size = %dKiB [%d]", 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;
-
- devinit_err:
-@@ -377,9 +382,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;
-@@ -390,7 +395,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)
-@@ -409,8 +414,10 @@ static int block2mtd_setup2(const char *
- parse_err("illegal erase size");
- }
- }
-+ if (token[2] && (strlen(token[2]) + 1 > 80))
-+ parse_err("mtd device name too long");
-
-- add_device(name, erase_size);
-+ add_device(name, erase_size, token[2]);
-
- return 0;
- }
-@@ -444,7 +451,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)
- {
---- a/fs/partitions/check.c
-+++ b/fs/partitions/check.c
-@@ -639,6 +639,7 @@ try_scan:
- kfree(state);
- return 0;
- }
-+EXPORT_SYMBOL(rescan_partitions);
-
- unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
- {