diff options
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | 4 | ||||
| -rw-r--r-- | sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c index 9699171..39358e9 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c @@ -84,13 +84,13 @@ vdev_geom_orphan(struct g_consumer *cp) ZFS_LOG(1, "Closing access to %s.", cp->provider->name); g_access(cp, -cp->acr, -cp->acw, -cp->ace); - g_detach(cp); ZFS_LOG(1, "Destroyed consumer to %s.", cp->provider->name); + g_detach(cp); g_destroy_consumer(cp); /* Destroy geom if there are no consumers left. */ if (LIST_EMPTY(&gp->consumer)) { ZFS_LOG(1, "Destroyed geom %s.", gp->name); - g_wither_geom(cp->geom, error); + g_wither_geom(gp, error); } vdev_geom_release(vd); /* Both methods below work, but in a bit different way. */ diff --git a/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c b/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c index 9699171..39358e9 100644 --- a/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c +++ b/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c @@ -84,13 +84,13 @@ vdev_geom_orphan(struct g_consumer *cp) ZFS_LOG(1, "Closing access to %s.", cp->provider->name); g_access(cp, -cp->acr, -cp->acw, -cp->ace); - g_detach(cp); ZFS_LOG(1, "Destroyed consumer to %s.", cp->provider->name); + g_detach(cp); g_destroy_consumer(cp); /* Destroy geom if there are no consumers left. */ if (LIST_EMPTY(&gp->consumer)) { ZFS_LOG(1, "Destroyed geom %s.", gp->name); - g_wither_geom(cp->geom, error); + g_wither_geom(gp, error); } vdev_geom_release(vd); /* Both methods below work, but in a bit different way. */ |
