Author: mav
Date: Thu Apr 15 12:22:47 2010
New Revision: 206654
URL: http://svn.freebsd.org/changeset/base/206654
Log:
MFC r205680:
Use last 16 bytes of serial number in metadata instead of first ones,
same as Intel MatrixRAID does.
PR: kern/124064
Modified:
stable/7/sys/dev/ata/ata-raid.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/ata/ata-raid.c
==============================================================================
--- stable/7/sys/dev/ata/ata-raid.c Thu Apr 15 12:20:13 2010
(r206653)
+++ stable/7/sys/dev/ata/ata-raid.c Thu Apr 15 12:22:47 2010
(r206654)
@@ -2559,8 +2559,15 @@ ata_raid_intel_read_meta(device_t dev, s
if (meta->generation >= raid->generation) {
for (disk = 0; disk < raid->total_disks; disk++) {
struct ata_device *atadev = device_get_softc(parent);
+ int len;
- if (!strncmp(raid->disks[disk].serial, atadev->param.serial,
+ for (len = 0; len < sizeof(atadev->param.serial); len++) {
+ if (atadev->param.serial[len] < 0x20)
+ break;
+ }
+ len = (len > sizeof(raid->disks[disk].serial)) ?
+ len - sizeof(raid->disks[disk].serial) : 0;
+ if (!strncmp(raid->disks[disk].serial, atadev->param.serial +
len,
sizeof(raid->disks[disk].serial))) {
raid->disks[disk].dev = parent;
raid->disks[disk].flags |= (AR_DF_PRESENT | AR_DF_ONLINE);
@@ -2627,8 +2634,15 @@ ata_raid_intel_write_meta(struct ar_soft
device_get_softc(device_get_parent(rdp->disks[disk].dev));
struct ata_device *atadev =
device_get_softc(rdp->disks[disk].dev);
+ int len;
- bcopy(atadev->param.serial, meta->disk[disk].serial,
+ for (len = 0; len < sizeof(atadev->param.serial); len++) {
+ if (atadev->param.serial[len] < 0x20)
+ break;
+ }
+ len = (len > sizeof(rdp->disks[disk].serial)) ?
+ len - sizeof(rdp->disks[disk].serial) : 0;
+ bcopy(atadev->param.serial + len, meta->disk[disk].serial,
sizeof(rdp->disks[disk].serial));
meta->disk[disk].sectors = rdp->disks[disk].sectors;
meta->disk[disk].id = (ch->unit << 16) | ATA_DEV(atadev->unit);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
