diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-08-26 17:47:14 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-08-26 17:47:14 +0000 |
| commit | 6007ed4fa8b2ede05e4cfcb6e9def1a2544b5c0e (patch) | |
| tree | 6dde34e6c4a7af59875c025775b386b78382a79b | |
| parent | 5a6f44332310a6da18eec350f66011659ea1f58c (diff) | |
| download | upstream-6007ed4fa8b2ede05e4cfcb6e9def1a2544b5c0e.tar.gz upstream-6007ed4fa8b2ede05e4cfcb6e9def1a2544b5c0e.tar.bz2 upstream-6007ed4fa8b2ede05e4cfcb6e9def1a2544b5c0e.zip | |
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
3 files changed, 6 insertions, 3 deletions
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; + } |