FIX: resolve make everything compilation error

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

diff --git a/platform-intel.h b/platform-intel.h
index 0cba6c748821469754664230f5af49c8d345b58b..99450ba7c744a59a857acd1c8842d5618a245a16 100644 (file)
--- a/platform-intel.h
+++ b/platform-intel.h
@@ -124,11 +124,13 @@ 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 */
-       return !!(orom->sss & (1 << (fs - 1)));
+       orom_chunk_bit = (orom->sss & (1 << (fs - 1)));
+       return orom_chunk_bit && 1 << orom_chunk_bit == chunk;
 }
 
 
@@ -167,21 +169,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,11 +176,11 @@ enum sys_dev_type {
        SYS_DEV_MAX
 };
 
-
 struct sys_dev {
        enum sys_dev_type type;
        char *path;
        char *pci_id;
+       __u16  dev_id;
        struct sys_dev *next;
 };