aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-02-24 18:27:49 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-02-24 18:27:49 +0000
commitefea65bb9956068414a53d8dad840aa60bf5201b (patch)
tree73bb349d56f3d0a71bab9b52beb20f5cf65c73c0 /target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
parente67f5ed2e61d3fc9267086a5d7e75a6828ea14c0 (diff)
downloadupstream-efea65bb9956068414a53d8dad840aa60bf5201b.tar.gz
upstream-efea65bb9956068414a53d8dad840aa60bf5201b.tar.bz2
upstream-efea65bb9956068414a53d8dad840aa60bf5201b.zip
generic/4.0: the ubi patches has been fixed in the 3.19 patchset already
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 44529
Diffstat (limited to 'target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch')
-rw-r--r--target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
index 5aafea7366..c0ee1f7673 100644
--- a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
+++ b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -11,8 +11,8 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
-@@ -614,6 +614,44 @@ static void __init ubiblock_create_from_
- }
+@@ -614,6 +614,44 @@ static int __init ubiblock_create_from_p
+ return ret;
}
+#define UBIFS_NODE_MAGIC 0x06101831
@@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+
+ ret = ubiblock_create(&vi);
+ if (ret)
-+ ubi_err("block: can't add '%s' volume, err=%d\n",
++ pr_err("UBI error: block: can't add '%s' volume, err=%d\n",
+ vi.name, ret);
+ /* always break if we get here */
+ break;
@@ -57,8 +57,8 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
{
struct ubiblock *next;
@@ -644,6 +682,10 @@ int __init ubiblock_init(void)
- */
- ubiblock_create_from_param();
+ if (ret)
+ goto err_remove;
+ /* auto-attach "rootfs" volume if existing and non-ubifs */
+ if (config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV))