md/raid5: Do not add data_offset before call to is_badblock
authormajianpeng <majianpeng@gmail.com>
Tue, 12 Jun 2012 00:31:10 +0000 (08:31 +0800)
committerNeilBrown <neilb@suse.de>
Tue, 3 Jul 2012 02:09:57 +0000 (12:09 +1000)
commit6c0544e255dd6582a9899572e120fb55d9f672a4
treef77e75815a54c6af1068dceb6ada1eb51d8501ce
parent5cfb22a1f83e4f04c0a4df89b60053a077222e2b
md/raid5: Do not add data_offset before call to is_badblock

In chunk_aligned_read() we are adding data_offset before calling
is_badblock.  But is_badblock also adds data_offset, so that is bad.

So move the addition of data_offset to after the call to
is_badblock.

This bug was introduced by commit 31c176ecdf3563140e639
     md/raid5: avoid reading from known bad blocks.
which first appeared in 3.0.  So that patch is suitable for any
-stable kernel from 3.0.y onwards.  However it will need minor
revision for most of those (as the comment didn't appear until
recently).

Cc: stable@vger.kernel.org
Signed-off-by: majianpeng <majianpeng@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
drivers/md/raid5.c