summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLiu Bo <bo.li.liu@oracle.com>2017-11-03 11:24:44 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-20 10:10:26 +0100
commitddf2588a05c820b305bc6db2fe6e498a3bc6fde9 (patch)
treea3d026e2e8d6285c7e2d1a2548447ce95dc829a6 /block
parentf6a341e87c656f1e2e9959cfdd2d02561724558f (diff)
downloadlinux-stable-ddf2588a05c820b305bc6db2fe6e498a3bc6fde9.tar.gz
linux-stable-ddf2588a05c820b305bc6db2fe6e498a3bc6fde9.tar.bz2
linux-stable-ddf2588a05c820b305bc6db2fe6e498a3bc6fde9.zip
badblocks: fix wrong return value in badblocks_set if badblocks are disabled
[ Upstream commit 39b4954c0a1556f8f7f1fdcf59a227117fcd8a0b ] MD's rdev_set_badblocks() expects that badblocks_set() returns 1 if badblocks are disabled, otherwise, rdev_set_badblocks() will record superblock changes and return success in that case and md will fail to report an IO error which it should. This bug has existed since badblocks were introduced in commit 9e0e252a048b ("badblocks: Add core badblock management code"). Signed-off-by: Liu Bo <bo.li.liu@oracle.com> Acked-by: Guoqing Jiang <gqjiang@suse.com> Signed-off-by: Shaohua Li <shli@fb.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/badblocks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/badblocks.c b/block/badblocks.c
index 43c71166e1e2..91f7bcf979d3 100644
--- a/block/badblocks.c
+++ b/block/badblocks.c
@@ -178,7 +178,7 @@ int badblocks_set(struct badblocks *bb, sector_t s, int sectors,
if (bb->shift < 0)
/* badblocks are disabled */
- return 0;
+ return 1;
if (bb->shift) {
/* round the start down, and the end up */