Drive database update

Added:

Adata S396 (obtained from drive_id)
Apple MacBookAir3,1 SSD (obtained from drive_id)
Apple MacBookPro10,1 SSD (obtained from drive_id)
Intel 510 (obtained from drive_id)
Intel 710 (obtained from drive_id)
Intel DC S3500 (obtained from drive_id)
Netapp LUN (obtained from illumos user's sd.conf)
OCZ Agility 3 (obtained from drive_id)
OCZ Vertex (obtained from drive_id)
Samsung PM800 (obtained from drive_id)
Sandisk U100 (obtained from drive_id)
Sun Comstar (obtained from illumos user's sd.conf)

Notes:

1. The entries for the Intel DC S3500 were extrapolated from the 800GB
model's entry, which is "ATA     INTEL SSDSC2BB80".

2. The entires for the Intel 710 were extrapolated from the 120GG
model's entry, which is "ATA     INTEL SSDSA2BZ12".

3. The entires for the Intel 510 were extrapolated from the 250GB
model's entry, which is "ATA     INTEL SSDSC2MH25".

4. The entires for the Apple MacBookPro10,1 SSD were extrapolated from
the 512GB model's entry, which is "ATA     APPLE SSD SM512E". Google
searches suggest that this is a rebadged Samsung 830.

5. The entires for the Apple MacBookAir3,1 SSD were extrapolated from
the 128GB model's entry, which is "ATA     APPLE SSD TS128C". Google
searches suggest that this is a rebadged Kingston SSDNow V+ 100 (based
on Toshiba).

6. Sun Comstar is an iSCSI Target, so we cannot tell what the correct
sector size is through this method. We list it only for reference
purposes, but it is commented out. Similarly, it is not clear what the
right thing to do for Netapp is, so we comment it out.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1907

diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index 60d05565c037f4e41732fb524a2588ae739a313b..596c0cb60d46e883fece1e1324867225b97cee46 100644 (file)
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -106,6 +106,11 @@ typedef struct vdev_disk_db_entry
  * negatives
  */
 static vdev_disk_db_entry_t vdev_disk_database[] = {
+       {"ATA     ADATA SSD S396 3", 8192},
+       {"ATA     APPLE SSD SM128E", 8192},
+       {"ATA     APPLE SSD SM256E", 8192},
+       {"ATA     APPLE SSD SM512E", 8192},
+       {"ATA     APPLE SSD SM768E", 8192},
        {"ATA     C400-MTFDDAC064M", 8192},
        {"ATA     C400-MTFDDAC128M", 8192},
        {"ATA     C400-MTFDDAC256M", 8192},
@@ -113,6 +118,9 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
        {"ATA     Corsair Force 3 ", 8192},
        {"ATA     Corsair Force GS", 8192},
        {"ATA     INTEL SSDSA2CT04", 8192},
+       {"ATA     INTEL SSDSA2BZ10", 8192},
+       {"ATA     INTEL SSDSA2BZ20", 8192},
+       {"ATA     INTEL SSDSA2BZ30", 8192},
        {"ATA     INTEL SSDSA2CW04", 8192},
        {"ATA     INTEL SSDSA2CW08", 8192},
        {"ATA     INTEL SSDSA2CW12", 8192},
@@ -123,6 +131,15 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
        {"ATA     INTEL SSDSC2BA20", 8192},
        {"ATA     INTEL SSDSC2BA40", 8192},
        {"ATA     INTEL SSDSC2BA80", 8192},
+       {"ATA     INTEL SSDSC2BB08", 8192},
+       {"ATA     INTEL SSDSC2BB12", 8192},
+       {"ATA     INTEL SSDSC2BB16", 8192},
+       {"ATA     INTEL SSDSC2BB24", 8192},
+       {"ATA     INTEL SSDSC2BB30", 8192},
+       {"ATA     INTEL SSDSC2BB40", 8192},
+       {"ATA     INTEL SSDSC2BB48", 8192},
+       {"ATA     INTEL SSDSC2BB60", 8192},
+       {"ATA     INTEL SSDSC2BB80", 8192},
        {"ATA     INTEL SSDSC2CT06", 8192},
        {"ATA     INTEL SSDSC2CT12", 8192},
        {"ATA     INTEL SSDSC2CT18", 8192},
@@ -139,6 +156,7 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
        {"ATA     M4-CT256M4SSD2  ", 8192},
        {"ATA     M4-CT512M4SSD2  ", 8192},
        {"ATA     OCZ-AGILITY2    ", 8192},
+       {"ATA     OCZ-AGILITY3    ", 8192},
        {"ATA     OCZ-VERTEX2 3.5 ", 8192},
        {"ATA     OCZ-VERTEX3     ", 8192},
        {"ATA     OCZ-VERTEX3 LT  ", 8192},
@@ -150,16 +168,25 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
        {"ATA     SAMSUNG MZ7WD960", 8192},
        {"ATA     SAMSUNG SSD 830 ", 8192},
        {"ATA     Samsung SSD 840 ", 8192},
+       {"ATA     SanDisk SSD U100", 8192},
        {"ATA     TOSHIBA THNSNH06", 8192},
        {"ATA     TOSHIBA THNSNH12", 8192},
        {"ATA     TOSHIBA THNSNH25", 8192},
        {"ATA     TOSHIBA THNSNH51", 8192},
+       {"ATA     APPLE SSD TS064C", 4096},
+       {"ATA     APPLE SSD TS128C", 4096},
+       {"ATA     APPLE SSD TS256C", 4096},
+       {"ATA     APPLE SSD TS512C", 4096},
        {"ATA     INTEL SSDSA2M040", 4096},
        {"ATA     INTEL SSDSA2M080", 4096},
        {"ATA     INTEL SSDSA2M160", 4096},
+       {"ATA     INTEL SSDSC2MH12", 4096},
+       {"ATA     INTEL SSDSC2MH25", 4096},
        {"ATA     OCZ CORE_SSD    ", 4096},
+       {"ATA     OCZ-VERTEX      ", 4096},
        {"ATA     SAMSUNG MCCOE32G", 4096},
        {"ATA     SAMSUNG MCCOE64G", 4096},
+       {"ATA     SAMSUNG SSD PM80", 4096},
        /* Imported from Open Solaris*/
        {"ATA     MARVELL SD88SA02", 4096},
        /* Advanced format Hard drives */
@@ -180,6 +207,8 @@ static vdev_disk_db_entry_t vdev_disk_database[] = {
        {"ATA     QEMU HARDDISK   ", 8192},
        {"IET     VIRTUAL-DISK    ", 8192},
        {"OI      COMSTAR         ", 8192},
+       {"SUN     COMSTAR         ", 8192},
+       {"NETAPP  LUN             ", 8192},
 #endif
 };