Now that mfi(4) header files uses the absolute number of entries to

make the mfi_array 288 bytes, remove this magic number and the
calculations that go with it.  Use the MFI_MAX_ROW_SIZE and
sizeof(struct mfi_array) in place of the prior calculations.

Change reporting a disk as "SYSTEM" when it is a "JBOD" reported
by the firmware and MegaCli.  A JBOD appears as /dev/mfisyspd<n>.

This also means the mfiutil command to "create jbod" is now a
little confusing since a RAID per drive is not really what LSI
defines JBOD to be.  In the future mfiutil should have an option
to create real JBOD's and enable that option in RAID controllers
that support it.  In testing, it appears the RAID cache is not
used with JBOD but is with the RAID per disk.  When this is
implemented more testing should be done to determine the pro's and
con's of JBOD versus RAID per disk.

Reviewed by:	jhb

1 files changed, 3 insertions, 4 deletions

diff --git a/usr.sbin/mfiutil/mfi_config.c b/usr.sbin/mfiutil/mfi_config.c
index f6f1a9da4223..985bd928e036 100644
--- a/usr.sbin/mfiutil/mfi_config.c
+++ b/usr.sbin/mfiutil/mfi_config.c
@@ -211,9 +211,8 @@ clear_config(int ac, char **av)
 }
 MFI_COMMAND(top, clear, clear_config);
 
-#define	MFI_ARRAY_SIZE		288
-#define	MAX_DRIVES_PER_ARRAY						\
-	((MFI_ARRAY_SIZE - sizeof(struct mfi_array)) / 8)
+#define MAX_DRIVES_PER_ARRAY MFI_MAX_ROW_SIZE
+#define MFI_ARRAY_SIZE sizeof(struct mfi_array)
 
 #define	RT_RAID0	0
 #define	RT_RAID1	1
@@ -305,7 +304,7 @@ parse_array(int fd, int raid_type, char *array_str, struct array_info *info)
 
 	/* Validate the number of drives for this array. */
 	if (count >= MAX_DRIVES_PER_ARRAY) {
-		warnx("Too many drives for a single array: max is %zu",
+		warnx("Too many drives for a single array: max is %d",
 		    MAX_DRIVES_PER_ARRAY);
 		return (EINVAL);
 	}