CVS commit: src/sys/dev/ic

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Sat Sep 27 17:40:54 UTC 2014

Modified Files:
        src/sys/dev/ic: mpt_netbsd.c

Log Message:
show "sd0" instead of "mpt0" for volume device name


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/mpt_netbsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/mpt_netbsd.c
diff -u src/sys/dev/ic/mpt_netbsd.c:1.26 src/sys/dev/ic/mpt_netbsd.c:1.27
--- src/sys/dev/ic/mpt_netbsd.c:1.26	Sat Sep 27 16:14:16 2014
+++ src/sys/dev/ic/mpt_netbsd.c	Sat Sep 27 17:40:54 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpt_netbsd.c,v 1.26 2014/09/27 16:14:16 jmcneill Exp $	*/
+/*	$NetBSD: mpt_netbsd.c,v 1.27 2014/09/27 17:40:54 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.26 2014/09/27 16:14:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.27 2014/09/27 17:40:54 jmcneill Exp $");
 
 #include "bio.h"
 
@@ -1778,6 +1778,7 @@ mpt_bio_ioctl_vol(mpt_softc_t *mpt, stru
 	fCONFIG_PAGE_IOC_2 *ioc2 = NULL;
 	fCONFIG_PAGE_IOC_2_RAID_VOL *ioc2rvol;
 	fCONFIG_PAGE_RAID_VOL_0 *rvol0 = NULL;
+	struct scsipi_periph *periph;
 	int address;
 
 	ioc2 = mpt_get_cfg_page_ioc2(mpt);
@@ -1794,7 +1795,13 @@ mpt_bio_ioctl_vol(mpt_softc_t *mpt, stru
 	if (rvol0 == NULL)
 		goto fail;
 
-	strlcpy(bv->bv_dev, device_xname(mpt->sc_dev), sizeof(bv->bv_dev));
+	periph = scsipi_lookup_periph(&mpt->sc_channel, ioc2rvol->VolumeBus, 0);
+	if (periph != NULL && periph->periph_dev != NULL) {
+		snprintf(bv->bv_dev, sizeof(bv->bv_dev), "%s",
+		    device_xname(periph->periph_dev));
+	} else {
+		bv->bv_dev[0] = '\0';
+	}
 	/* TODO: bv->bv_vendor */
 	bv->bv_nodisk = rvol0->NumPhysDisks;
 	bv->bv_size = (uint64_t)rvol0->MaxLBA * 512;