qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-07 08:27:28 +03:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13125 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars 2008-11-05 10:47:35 +00:00
parent d0ec2ce641
commit 4363af719c
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; return;
} }
@@ -231,31 +272,22 @@ static void block2mtd_free_device(struct @@ -288,47 +288,17 @@ static void block2mtd_sync(struct mtd_info *mtd)
kfree(dev);
} }
-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 */ -/* FIXME: ensure that mtd->size % erase_size == 0 */
-static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname) -static struct block2mtd_dev *add_device(char *devname, int erase_size, const char *mtdname)
+static int _open_bdev(struct block2mtd_dev *dev) +static int _open_bdev(struct block2mtd_dev *dev)
{ {
struct block_device *bdev; struct block_device *bdev;
struct block2mtd_dev *dev; - struct block2mtd_dev *dev;
struct mtd_partition *part; - struct mtd_partition *part;
char *name; - char *name;
- if (!devname) - if (!devname)
- return NULL; - return NULL;
@ -422,7 +438,7 @@
if (devt) { if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); 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 #endif
if (IS_ERR(bdev)) { if (IS_ERR(bdev)) {
@ -504,6 +520,7 @@
+{ +{
+ struct block2mtd_dev *dev; + struct block2mtd_dev *dev;
+ struct mtd_partition *part; + struct mtd_partition *part;
+ char *name;
+ +
+ if (!devname) + if (!devname)
+ return NULL; + return NULL;