From 70eb8219ac128ca88c1beff1e9cf48ed23846eea Mon Sep 17 00:00:00 2001 From: "Hawrylewicz Czarnowski, Przemyslaw" Date: Wed, 7 Dec 2011 12:15:55 +1100 Subject: fix: imsm: validate strip size - tuned up Neil's proposal seems more reasonable and shows what is really going on here. Signed-off-by: Przemyslaw Czarnowski Signed-off-by: NeilBrown --- platform-intel.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'platform-intel.h') diff --git a/platform-intel.h b/platform-intel.h index 99450ba7..c997f1b8 100644 --- a/platform-intel.h +++ b/platform-intel.h @@ -124,13 +124,12 @@ static inline int imsm_orom_has_raid5(const struct imsm_orom *orom) static inline int imsm_orom_has_chunk(const struct imsm_orom *orom, int chunk) { int fs = ffs(chunk); - int orom_chunk_bit; - if (!fs) return 0; fs--; /* bit num to bit index */ - orom_chunk_bit = (orom->sss & (1 << (fs - 1))); - return orom_chunk_bit && 1 << orom_chunk_bit == chunk; + if (chunk & (chunk-1)) + return 0; /* not a power of 2 */ + return !!(orom->sss & (1 << (fs - 1))); } -- cgit v1.2.3