projects
/
openwrt
/
staging
/
yousong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c1e6a7
)
fix a compile error in block2mtd when compiled as module
author
Felix Fietkau
<nbd@openwrt.org>
Thu, 18 Feb 2010 21:34:49 +0000
(21:34 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Thu, 18 Feb 2010 21:34:49 +0000
(21:34 +0000)
SVN-Revision: 19709
target/linux/generic-2.6/patches-2.6.30/065-rootfs_split.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic-2.6/patches-2.6.30/065-rootfs_split.patch
b/target/linux/generic-2.6/patches-2.6.30/065-rootfs_split.patch
index 824e3df10e057872c86637d945dc9ed53ef0a7b1..34c1f5addface52b3c6b743c2d0514e2aa06c39e 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.30/065-rootfs_split.patch
+++ b/
target/linux/generic-2.6/patches-2.6.30/065-rootfs_split.patch
@@
-441,7
+441,7
@@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
-@@ -263,17 +276,9
7
@@ static struct block2mtd_dev *add_device(
+@@ -263,17 +276,9
8
@@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
#endif
if (IS_ERR(bdev)) {
@@
-505,9
+505,10
@@
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
-+ else {
++#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
++ else
+ err = rescan_partitions(bdev->bd_disk, bdev);
+ err = rescan_partitions(bdev->bd_disk, bdev);
-+
}
++
#endif
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
@@
-542,7
+543,7
@@
if (!mtdname)
mtdname = devname;
if (!mtdname)
mtdname = devname;
-@@ -297,6 +39
0
,7 @@ static struct block2mtd_dev *add_device(
+@@ -297,6 +39
1
,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
diff --git
a/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
b/target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
index 50ca25ce6726dbec83656b6e4394a3bb0016be2b..7956baf9b3970f08bbbbac8b6c848078b21b79bc 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
+++ b/
target/linux/generic-2.6/patches-2.6.31/065-rootfs_split.patch
@@
-434,7
+434,7
@@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
-@@ -263,17 +276,9
7
@@ static struct block2mtd_dev *add_device(
+@@ -263,17 +276,9
8
@@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
#endif
if (IS_ERR(bdev)) {
@@
-498,9
+498,10
@@
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
-+ else {
++#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
++ else
+ err = rescan_partitions(bdev->bd_disk, bdev);
+ err = rescan_partitions(bdev->bd_disk, bdev);
-+
}
++
#endif
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
@@
-535,7
+536,7
@@
if (!mtdname)
mtdname = devname;
if (!mtdname)
mtdname = devname;
-@@ -297,6 +39
0
,7 @@ static struct block2mtd_dev *add_device(
+@@ -297,6 +39
1
,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
diff --git
a/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
b/target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
index 307e5ee347f322f17ef12311f2bdfb6305e4f138..22b3f5e9000ce7113126535756d88a68d218ffbe 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
+++ b/
target/linux/generic-2.6/patches-2.6.32/065-rootfs_split.patch
@@
-434,7
+434,7
@@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
-@@ -263,17 +276,9
7
@@ static struct block2mtd_dev *add_device(
+@@ -263,17 +276,9
8
@@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
#endif
if (IS_ERR(bdev)) {
@@
-498,9
+498,10
@@
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
+ bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
+ if (!bdev || !bdev->bd_disk)
+ err = -EINVAL;
-+ else {
++#ifndef CONFIG_MTD_BLOCK2MTD_MODULE
++ else
+ err = rescan_partitions(bdev->bd_disk, bdev);
+ err = rescan_partitions(bdev->bd_disk, bdev);
-+
}
++
#endif
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
+ if (bdev)
+ close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
+
@@
-535,7
+536,7
@@
if (!mtdname)
mtdname = devname;
if (!mtdname)
mtdname = devname;
-@@ -297,6 +39
0
,7 @@ static struct block2mtd_dev *add_device(
+@@ -297,6 +39
1
,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;