From 9b3f6b4237fa1168168cca4bdc5c2a8045642bb4 Mon Sep 17 00:00:00 2001
From: Eric Kustarz <Eric.Kustarz@Sun.COM>
Date: Tue, 12 Aug 2008 14:14:36 -0700
Subject: 6734585 zpool history should log when a spare device becomes active
 6736002 zinject needs to init/destroy rw inject_lock

---
 usr/src/uts/common/fs/zfs/vdev.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'usr/src/uts/common/fs/zfs/vdev.c')

diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c
index 4d87fb069b..d57f603ab7 100644
--- a/usr/src/uts/common/fs/zfs/vdev.c
+++ b/usr/src/uts/common/fs/zfs/vdev.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/zfs_context.h>
 #include <sys/fm/fs/zfs.h>
 #include <sys/spa.h>
@@ -1542,6 +1540,12 @@ vdev_description(vdev_t *vd)
 	if (vd->vdev_path != NULL)
 		return (vd->vdev_path);
 
+	if (vd->vdev_physpath != NULL)
+		return (vd->vdev_physpath);
+
+	if (vd->vdev_devid != NULL)
+		return (vd->vdev_devid);
+
 	if (vd->vdev_parent == NULL)
 		return (spa_name(vd->vdev_spa));
 
-- 
cgit v1.2.3