diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2011-06-13 01:48:22 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-06-14 00:09:41 -0400 |
| commit | 9b2dc8b665932a8e681a7ab3237f60475e75e161 (patch) | |
| tree | 2f9b4b6a1439de5eb15afe0ca8c71f3e2347befc /drivers/md | |
| parent | f699bf2328521cc3e20c412fcdb9ffe1255c360f (diff) | |
md/raid5: fix raid5_set_bi_hw_segments
The @bio->bi_phys_segments consists of active stripes count in the
lower 16 bits and processed stripes count in the upper 16 bits. So
logical-OR operator should be bitwise one.
This bug has been present since 2.6.27 and the fix is suitable for any
-stable kernel since then. Fortunately the bad code is only used on
error paths and is relatively unlikely to be hit.
Cc: stable@kernel.org
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index f9d2fbc64977..af8a9a89e4da 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -129,7 +129,7 @@ static inline int raid5_dec_bi_hw_segments(struct bio *bio) | |||
| 129 | 129 | ||
| 130 | static inline void raid5_set_bi_hw_segments(struct bio *bio, unsigned int cnt) | 130 | static inline void raid5_set_bi_hw_segments(struct bio *bio, unsigned int cnt) |
| 131 | { | 131 | { |
| 132 | bio->bi_phys_segments = raid5_bi_phys_segments(bio) || (cnt << 16); | 132 | bio->bi_phys_segments = raid5_bi_phys_segments(bio) | (cnt << 16); |
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | /* Find first data disk in a raid6 stripe */ | 135 | /* Find first data disk in a raid6 stripe */ |