Author: asomers
Date: Tue Nov 28 17:25:24 2017
New Revision: 326325
URL: https://svnweb.freebsd.org/changeset/base/326325
Log:
MFC r322546:
Fix some ZFS debugging messages
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Be more careful about the use of provider names vs vdev names in
ZFS_LOG statements.
Sponsored by: Spectra Logic Corp
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Tue Nov 28 17:20:53 2017 (r326324)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Tue Nov 28 17:25:24 2017 (r326325)
@@ -747,7 +747,7 @@ vdev_geom_open_by_guids(vdev_t *vd)
ZFS_LOG(1, "Attach by guid [%ju:%ju] succeeded, provider %s.",
(uintmax_t)spa_guid(vd->vdev_spa),
- (uintmax_t)vd->vdev_guid, vd->vdev_path);
+ (uintmax_t)vd->vdev_guid, cp->provider->name);
} else {
ZFS_LOG(1, "Search by guid [%ju:%ju] failed.",
(uintmax_t)spa_guid(vd->vdev_spa),
@@ -849,12 +849,12 @@ vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *
VERIFY(tsd_set(zfs_geom_probe_vdev_key, NULL) == 0);
if (cp == NULL) {
- ZFS_LOG(1, "Provider %s not found.", vd->vdev_path);
+ ZFS_LOG(1, "Vdev %s not found.", vd->vdev_path);
error = ENOENT;
} else if (cp->provider->sectorsize > VDEV_PAD_SIZE ||
!ISP2(cp->provider->sectorsize)) {
ZFS_LOG(1, "Provider %s has unsupported sectorsize.",
- vd->vdev_path);
+ cp->provider->name);
vdev_geom_close_locked(vd);
error = EINVAL;
@@ -872,7 +872,7 @@ vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *
}
if (error != 0) {
printf("ZFS WARNING: Unable to open %s for writing
(error=%d).\n",
- vd->vdev_path, error);
+ cp->provider->name, error);
vdev_geom_close_locked(vd);
cp = NULL;
}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
