diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
| commit | 267e12a7d9bf6e5fcefb9cc00f46bfff0dc5226e (patch) | |
| tree | 19a3941920d0039c35d53a5cbee189b5ca51995a /usr/src/uts/common/fs/zfs/vdev.c | |
| parent | 517abc5c668925e6092495bf332233c3599980d2 (diff) | |
| parent | e9faba760cdf80d7dfa110fe0830917ab94668c2 (diff) | |
| download | illumos-joyent-vpc.tar.gz | |
Merge branch 'master' into vpcvpc
Diffstat (limited to 'usr/src/uts/common/fs/zfs/vdev.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/vdev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c index e82b309537..254af68099 100644 --- a/usr/src/uts/common/fs/zfs/vdev.c +++ b/usr/src/uts/common/fs/zfs/vdev.c @@ -1365,7 +1365,7 @@ vdev_probe_done(zio_t *zio) } else { ASSERT(zio->io_error != 0); vdev_dbgmsg(vd, "failed probe"); - zfs_ereport_post(FM_EREPORT_ZFS_PROBE_FAILURE, + (void) zfs_ereport_post(FM_EREPORT_ZFS_PROBE_FAILURE, spa, vd, NULL, NULL, 0, 0); zio->io_error = SET_ERROR(ENXIO); } @@ -1717,7 +1717,8 @@ vdev_open(vdev_t *vd) */ if (ashift > vd->vdev_top->vdev_ashift && vd->vdev_ops->vdev_op_leaf) { - zfs_ereport_post(FM_EREPORT_ZFS_DEVICE_BAD_ASHIFT, + (void) zfs_ereport_post( + FM_EREPORT_ZFS_DEVICE_BAD_ASHIFT, spa, vd, NULL, NULL, 0, 0); } @@ -4408,7 +4409,7 @@ vdev_set_state(vdev_t *vd, boolean_t isopen, vdev_state_t state, vdev_aux_t aux) class = FM_EREPORT_ZFS_DEVICE_UNKNOWN; } - zfs_ereport_post(class, spa, vd, NULL, NULL, + (void) zfs_ereport_post(class, spa, vd, NULL, NULL, save_state, 0); } |