Commit fbfa65f9e3eb26937a90f023a8fd4d181189c1ef

Authored by Namhyung Kim
Committed by Greg Kroah-Hartman
1 parent 1d15c2e0b9

md/raid5: fix raid5_set_bi_hw_segments

commit 9b2dc8b665932a8e681a7ab3237f60475e75e161 upstream.

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.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -129,7 +129,7 @@
129 129  
130 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 135 /* Find first data disk in a raid6 stripe */