Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b2dc8b6 authored by Namhyung Kim's avatar Namhyung Kim Committed by NeilBrown
Browse files

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: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent f699bf23

drivers/md/raid5.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,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)

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 */

/* Find first data disk in a raid6 stripe */