KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix broken patch to drivers/mtd/device/block2mtd.c

Browse source 
SVN-Revision: 13125
This commit is contained in:
Lars-Peter Clausen 2008-11-05 10:47:35 +00:00
parent d96cec4149
commit 3bd685b0ce
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
target/linux/generic-2.6/patches-2.6.27/065-rootfs_split.patch
View file

@ -387,19 +387,35 @@
return;
}
@@ -231,31 +272,22 @@ static void block2mtd_free_device(struct
kfree(dev);
@@ -288,47 +288,17 @@ static void block2mtd_sync(struct mtd_info *mtd)
}
-static void block2mtd_free_device(struct block2mtd_dev *dev)
-{
- if (!dev)
- return;
-
- kfree(dev->mtd.name);
-
- if (dev->blkdev) {
- invalidate_mapping_pages(dev->blkdev->bd_inode->i_mapping,
- 0, -1);
- close_bdev_excl(dev->blkdev);
- }
-
- kfree(dev);
-}
-
-
-/* FIXME: ensure that mtd->size % erase_size == 0 */
-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+static int _open_bdev(struct block2mtd_dev *dev)
{
struct block_device *bdev;
struct block2mtd_dev *dev;
struct mtd_partition *part;
char *name;
- struct block2mtd_dev *dev;
- struct mtd_partition *part;
- char *name;
- if (!devname)
- return NULL;
@ -422,7 +438,7 @@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
@@ -263,17 +295,96 @@ static struct block2mtd_dev *add_device(
@@ -263,17 +295,97 @@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
@ -504,6 +520,7 @@
+{
+ struct block2mtd_dev *dev;
+ struct mtd_partition *part;
+ char *name;
+
+ if (!devname)
+ return NULL;