173a174,195
> /*PRINTFLIKE2*/
> void
> vdev_dbgmsg(vdev_t *vd, const char *fmt, ...)
> {
> va_list adx;
> char buf[256];
>
> va_start(adx, fmt);
> (void) vsnprintf(buf, sizeof (buf), fmt, adx);
> va_end(adx);
>
> if (vd->vdev_path != NULL) {
> zfs_dbgmsg("%s vdev '%s': %s", vd->vdev_ops->vdev_op_type,
> vd->vdev_path, buf);
> } else {
> zfs_dbgmsg("%s-%llu vdev (guid %llu): %s",
> vd->vdev_ops->vdev_op_type,
> (u_longlong_t)vd->vdev_id,
> (u_longlong_t)vd->vdev_guid, buf);
> }
> }
>
1033c1055,1057
< if (error)
---
> if (error != 0) {
> vdev_dbgmsg(vd, "unable to read the metaslab "
> "array [error=%d]", error);
1034a1059
> }
1039c1064,1066
< if (error)
---
> if (error != 0) {
> vdev_dbgmsg(vd, "metaslab_init failed [error=%d]",
> error);
1040a1068
> }
1122,1123c1150
< zfs_dbgmsg("failed probe on vdev %llu",
< (longlong_t)vd->vdev_id);
---
> vdev_dbgmsg(vd, "failed probe");
1578a1606
> vdev_dbgmsg(vd, "vdev_validate: failed reading config");
1590a1619,1620
> vdev_dbgmsg(vd, "vdev_validate: vdev split into other "
> "pool");
1599a1630,1633
> vdev_dbgmsg(vd, "vdev_validate: vdev label pool_guid "
> "doesn't match config (%llu != %llu)",
> (u_longlong_t)guid,
> (u_longlong_t)spa_guid(spa));
1628a1663,1665
> vdev_dbgmsg(vd, "vdev_validate: config guid doesn't "
> "match label guid (%llu != %llu)",
> (u_longlong_t)vd->vdev_guid, (u_longlong_t)guid);
1636a1674,1675
> vdev_dbgmsg(vd, "vdev_validate: '%s' missing",
> ZPOOL_CONFIG_POOL_STATE);
1648c1687,1690
< state != POOL_STATE_ACTIVE)
---
> state != POOL_STATE_ACTIVE) {
> vdev_dbgmsg(vd, "vdev_validate: invalid pool state "
> "(%llu) for spa %s", (u_longlong_t)state,
> spa->spa_name);
1649a1692
> }
2297,2299c2340,2343
< zfs_dbgmsg("txg %llu, spa %s, DTL old object %llu, "
< "new object %llu", txg, spa_name(spa), object,
< space_map_object(vd->vdev_dtl_sm));
---
> vdev_dbgmsg(vd, "txg %llu, spa %s, DTL old object %llu, "
> "new object %llu", (u_longlong_t)txg, spa_name(spa),
> (u_longlong_t)object,
> (u_longlong_t)space_map_object(vd->vdev_dtl_sm));
2406a2451,2453
> vdev_dbgmsg(vd, "vdev_load: invalid size. ashift=%llu, "
> "asize=%llu", (u_longlong_t)vd->vdev_ashift,
> (u_longlong_t)vd->vdev_asize);
2408a2456,2457
> vdev_dbgmsg(vd, "vdev_load: metaslab_init failed "
> "[error=%d]", error);
2420a2470,2471
> vdev_dbgmsg(vd, "vdev_load: vdev_dtl_load failed "
> "[error=%d]", error);
2433a2485,2487
> vdev_dbgmsg(vd, "vdev_load: space_map_open failed for "
> "obsolete spacemap (obj %llu) [error=%d]",
> (u_longlong_t)obsolete_sm_object, error);
3808,3810c3862,3864
< zfs_dbgmsg("SLOW IO: zio timestamp %lluns, "
< "delta %lluns, last io %lluns",
< fio->io_timestamp, delta,
---
> vdev_dbgmsg(vd, "SLOW IO: zio timestamp "
> "%lluns, delta %lluns, last io %lluns",
> fio->io_timestamp, (u_longlong_t)delta,