From b118303cc4f807cdc041d352cbe321edfdd66728 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 26 Aug 2013 17:47:14 +0000 Subject: kernel: fixing a potential deadlock in block2mtd for kernel 3.6/3.8/3.9 Signed-off-by: Alexander Couzens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37842 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.6/441-block2mtd_refresh.patch | 3 ++- target/linux/generic/patches-3.8/441-block2mtd_refresh.patch | 3 ++- target/linux/generic/patches-3.9/441-block2mtd_refresh.patch | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'target') 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 d54e52900e..7f8a1f1233 100644 --- 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 11b743db2e..b2b02229e1 100644 --- 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 11b743db2e..b2b02229e1 100644 --- 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; + } -- cgit v1.2.3