|
 |
8ccba5 |
diff --git a/lib/format/ataraid/sil.c.fix_sil_jbod b/lib/format/ataraid/sil.c
|
|
|
8ccba5 |
index 6089682..8c3df38 100644
|
|
|
8ccba5 |
--- a/lib/format/ataraid/sil.c.fix_sil_jbod
|
|
|
8ccba5 |
+++ b/lib/format/ataraid/sil.c
|
|
|
8ccba5 |
@@ -1,8 +1,8 @@
|
|
|
8ccba5 |
/*
|
|
|
8ccba5 |
* Silicon Image Medley ATARAID metadata format handler.
|
|
|
8ccba5 |
*
|
|
|
8ccba5 |
- * Copyright (C) 2004,2005 Heinz Mauelshagen, Red Hat GmbH.
|
|
|
8ccba5 |
- * All rights reserved.
|
|
|
8ccba5 |
+ * Copyright (C) 2004,2005,2009 Heinz Mauelshagen, Red Hat GmbH.
|
|
|
8ccba5 |
+ * All rights reserved.
|
|
|
8ccba5 |
*
|
|
|
8ccba5 |
* See file LICENSE at the top of this source tree for license information.
|
|
|
8ccba5 |
*/
|
|
|
8ccba5 |
@@ -166,6 +166,16 @@ sil_valid(struct lib_context *lc, struct dev_info *di,
|
|
|
8ccba5 |
return 1;
|
|
|
8ccba5 |
}
|
|
|
8ccba5 |
|
|
|
8ccba5 |
+/* Return number of array sectors. */
|
|
|
8ccba5 |
+static uint64_t
|
|
|
8ccba5 |
+array_size(struct raid_dev *rd)
|
|
|
8ccba5 |
+{
|
|
|
8ccba5 |
+ struct sil *sil = META(rd, sil);
|
|
|
8ccba5 |
+
|
|
|
8ccba5 |
+ return (((uint64_t) sil->array_sectors_high) << 32) +
|
|
|
8ccba5 |
+ sil->array_sectors_low;
|
|
|
8ccba5 |
+}
|
|
|
8ccba5 |
+
|
|
|
8ccba5 |
static void
|
|
|
8ccba5 |
free_sils(struct sil **sils, unsigned int i)
|
|
|
8ccba5 |
{
|
|
|
8ccba5 |
@@ -381,6 +391,10 @@ devices(struct raid_dev *rd, void *context)
|
|
|
8ccba5 |
struct sil *sil = META(rd, sil);
|
|
|
8ccba5 |
|
|
|
8ccba5 |
switch (sil->type) {
|
|
|
8ccba5 |
+ case SIL_T_JBOD:
|
|
|
8ccba5 |
+ ret = array_size(rd) < rd->sectors ?
|
|
|
8ccba5 |
+ 1 : sil->drives_per_striped_set;
|
|
|
8ccba5 |
+ break;
|
|
|
8ccba5 |
case SIL_T_RAID0:
|
|
|
8ccba5 |
case SIL_T_RAID10:
|
|
|
8ccba5 |
ret = sil->drives_per_striped_set;
|
|
|
8ccba5 |
@@ -519,12 +533,9 @@ stripes(struct sil *sil)
|
|
|
8ccba5 |
static uint64_t
|
|
|
8ccba5 |
sectors(struct raid_dev *rd)
|
|
|
8ccba5 |
{
|
|
|
8ccba5 |
- uint64_t array_sectors, ret = 0;
|
|
|
8ccba5 |
+ uint64_t array_sectors = array_size(rd), ret = 0;
|
|
|
8ccba5 |
struct sil *sil = META(rd, sil);
|
|
|
8ccba5 |
|
|
|
8ccba5 |
- array_sectors = (((uint64_t) sil->array_sectors_high) << 32) +
|
|
|
8ccba5 |
- sil->array_sectors_low;
|
|
|
8ccba5 |
-
|
|
|
8ccba5 |
switch (sil->type) {
|
|
|
8ccba5 |
case SIL_T_SPARE:
|
|
|
8ccba5 |
/* Cook them up... */
|