imsm: FIX: Check correct slots on disk failure

[thirdparty/mdadm.git] / platform-intel.h

diff --git a/platform-intel.h b/platform-intel.h
index e24ae37928b3b422664e41faed530e979de05708..c997f1b8e0c924a350c1ff6bb867402804f488cf 100644 (file)
--- a/platform-intel.h
+++ b/platform-intel.h
@@ -124,10 +124,11 @@ 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);
-
        if (!fs)
                return 0;
        fs--; /* bit num to bit index */
+       if (chunk & (chunk-1))
+               return 0; /* not a power of 2 */
        return !!(orom->sss & (1 << (fs - 1)));
 }
 
@@ -167,21 +168,6 @@ static inline int fls(int x)
        return r;
 }
 
-/**
- * imsm_orom_default_chunk - return the largest chunk size supported via orom
- * @orom: orom pointer from find_imsm_orom
- */
-static inline int imsm_orom_default_chunk(const struct imsm_orom *orom)
-{
-       int fs = fls(orom->sss);
-
-       if (!fs)
-               return 0;
-
-       return min(512, (1 << fs));
-}
-
-
 enum sys_dev_type {
        SYS_DEV_UNKNOWN = 0,
        SYS_DEV_SAS,
@@ -189,7 +175,6 @@ enum sys_dev_type {
        SYS_DEV_MAX
 };
 
-
 struct sys_dev {
        enum sys_dev_type type;
        char *path;