diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2011-06-13 14:48:22 +0900 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-17 11:20:50 -0400 |
| commit | a356578add4be8d1209645f8ba60f235db1f6e12 (patch) | |
| tree | 239e7103f33294c508bdbd191afb11e687d44386 /drivers/md | |
| parent | 6611502281d1f8d04cc2d79887b5d456c3c47b18 (diff) | |
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: Paul Gortmaker <paul.gortmaker@windriver.com>
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 6af0a6dde69..de7984dc98e 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -128,7 +128,7 @@ static inline int raid5_dec_bi_hw_segments(struct bio *bio) static inline void raid5_set_bi_hw_segments(struct bio *bio, unsigned int cnt) { - bio->bi_phys_segments = raid5_bi_phys_segments(bio) || (cnt << 16); + bio->bi_phys_segments = raid5_bi_phys_segments(bio) | (cnt << 16); } /* Find first data disk in a raid6 stripe */ |