diff -urN dmraid/1.0.0.rc13/lib/format/ddf/ddf1.c dmraid/1.0.0.rc14.bz211016/lib/format/ddf/ddf1.c --- dmraid/1.0.0.rc13/lib/format/ddf/ddf1.c 2006-09-22 16:25:45.000000000 +0200 +++ dmraid/1.0.0.rc14.bz211016/lib/format/ddf/ddf1.c 2006-10-26 15:25:44.000000000 +0200 @@ -682,7 +682,7 @@ struct ddf1_config_record *cr, struct ddf1_phys_drive *pd) { - if (cr) + if (cr && cr->sectors) /* Some Adaptec controllers need this clamping. */ return type(lc, ddf1, cr) == t_raid0 ? cr->sectors - cr->sectors % stride(cr) : cr->sectors; diff -urN dmraid/1.0.0.rc13/lib/format/ddf/ddf1_lib.c dmraid/1.0.0.rc14.bz211016/lib/format/ddf/ddf1_lib.c --- dmraid/1.0.0.rc13/lib/format/ddf/ddf1_lib.c 2006-09-13 15:42:04.000000000 +0200 +++ dmraid/1.0.0.rc14.bz211016/lib/format/ddf/ddf1_lib.c 2006-10-26 15:15:28.000000000 +0200 @@ -57,7 +57,9 @@ struct ddf1_header *h = ddf1->primary; /* The 0xFFFF nonsense is a weird Adaptec quirk */ - return (h->max_primary_elements == 0xFFFF && ddf1->adaptec_mode) ? +// bz211016 +// return (h->max_primary_elements == 0xFFFF && ddf1->adaptec_mode) ? + return (h->max_primary_elements == 0xFFFF) ? h->max_phys_drives : h->max_primary_elements; } diff -urN dmraid/1.0.0.rc13/lib/version.h dmraid/1.0.0.rc14.bz211016/lib/version.h --- dmraid/1.0.0.rc13/lib/version.h 2006-10-11 14:31:08.000000000 +0200 +++ dmraid/1.0.0.rc14.bz211016/lib/version.h 2006-10-26 15:21:13.000000000 +0200 @@ -1,12 +1,12 @@ #ifndef DMRAID_LIB_VERSION -#define DMRAID_LIB_VERSION "1.0.0.rc13" +#define DMRAID_LIB_VERSION "1.0.0.rc14.bz211016" #define DMRAID_LIB_MAJOR_VERSION 1 #define DMRAID_LIB_MINOR_VERSION 0 #define DMRAID_LIB_SUBMINOR_VERSION 0 -#define DMRAID_LIB_VERSION_SUFFIX "rc13" +#define DMRAID_LIB_VERSION_SUFFIX "rc14.bz211016" -#define DMRAID_LIB_DATE "(2006.10.11)" +#define DMRAID_LIB_DATE "(2006.10.26)" #endif --- dmraid/1.0.0.rc13/tools/VERSION 2006-10-11 14:31:20.000000000 +0200 +++ dmraid/1.0.0.rc14.bz211016/tools/VERSION 2006-10-26 15:20:59.000000000 +0200 @@ -1 +1 @@ -1.0.0.rc13 (2006.10.11) +1.0.0.rc14.bz211016 (2006.10.26)