diff options
| author | Eric Kustarz <Eric.Kustarz@Sun.COM> | 2008-08-12 14:14:36 -0700 |
|---|---|---|
| committer | Eric Kustarz <Eric.Kustarz@Sun.COM> | 2008-08-12 14:14:36 -0700 |
| commit | 9b3f6b4237fa1168168cca4bdc5c2a8045642bb4 (patch) | |
| tree | abcbdf27e7f98d79b105fd359003b4d55f1f994f /usr/src/uts/common/fs/zfs/vdev.c | |
| parent | a0dc2951a04dc9cb13b8dd7ef6e4a23b48b6824f (diff) | |
| download | illumos-gate-9b3f6b4237fa1168168cca4bdc5c2a8045642bb4.tar.gz | |
6734585 zpool history should log when a spare device becomes active
6736002 zinject needs to init/destroy rw inject_lock
Diffstat (limited to 'usr/src/uts/common/fs/zfs/vdev.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/vdev.c | 8 |
1 files changed, 6 insertions, 2 deletions
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)); |