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