kernel: fixing a potential deadlock in block2mtd for kernel 3.6/3.8/3.9

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37842 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/patches-3.6/441-block2mtd_refresh.patch b/target/linux/generic/patches-3.6/441-block2mtd_refresh.patch
index d54e529..7f8a1f1 100644 (file)
--- a/target/linux/generic/patches-3.6/441-block2mtd_refresh.patch
+++ b/target/linux/generic/patches-3.6/441-block2mtd_refresh.patch
@@ -53,8 +53,9 @@
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);
 -              if (IS_ERR(page))
+-                      return PTR_ERR(page);
 +              if (IS_ERR(page)) {
-                       return PTR_ERR(page);
++                      err = PTR_ERR(page);
 +                      goto done;
 +              }
  

diff --git a/target/linux/generic/patches-3.8/441-block2mtd_refresh.patch b/target/linux/generic/patches-3.8/441-block2mtd_refresh.patch
index 11b743d..b2b0222 100644 (file)
--- a/target/linux/generic/patches-3.8/441-block2mtd_refresh.patch
+++ b/target/linux/generic/patches-3.8/441-block2mtd_refresh.patch
@@ -53,8 +53,9 @@
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);
 -              if (IS_ERR(page))
+-                      return PTR_ERR(page);
 +              if (IS_ERR(page)) {
-                       return PTR_ERR(page);
++                      err = PTR_ERR(page);
 +                      goto done;
 +              }
  

diff --git a/target/linux/generic/patches-3.9/441-block2mtd_refresh.patch b/target/linux/generic/patches-3.9/441-block2mtd_refresh.patch
index 11b743d..b2b0222 100644 (file)
--- a/target/linux/generic/patches-3.9/441-block2mtd_refresh.patch
+++ b/target/linux/generic/patches-3.9/441-block2mtd_refresh.patch
@@ -53,8 +53,9 @@
  
                page = page_read(dev->blkdev->bd_inode->i_mapping, index);
 -              if (IS_ERR(page))
+-                      return PTR_ERR(page);
 +              if (IS_ERR(page)) {
-                       return PTR_ERR(page);
++                      err = PTR_ERR(page);
 +                      goto done;
 +              }