From bb4927938841f73115f84938cee8cf02cc0c696b Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Thu, 8 Nov 2012 01:28:39 +0000 Subject: [PATCH] Update vendor-sys/illumos/dist to illumos-gate 13866:040f4b0699ee (no FreeBSD-relevant changes - illumos issue #3301) --- uts/common/Makefile.files | 12 +++++++++++- uts/common/fs/zfs/vdev_disk.c | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/uts/common/Makefile.files b/uts/common/Makefile.files index 4213fa8720c..baeb7b0015a 100644 --- a/uts/common/Makefile.files +++ b/uts/common/Makefile.files @@ -21,7 +21,7 @@ # # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2011 Nexenta Systems, Inc. All rights reserved. +# Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2012 by Delphix. All rights reserved. # @@ -1943,6 +1943,16 @@ NXGE_NPI_OBJS = \ NXGE_HCALL_OBJS = \ nxge_hcall.o +# +# Virtio modules +# + +# Virtio core +VIRTIO_OBJS = virtio.o + +# Virtio block driver +VIOBLK_OBJS = vioblk.o + # # kiconv modules # diff --git a/uts/common/fs/zfs/vdev_disk.c b/uts/common/fs/zfs/vdev_disk.c index 759f0f84f1c..6f8cb177b9e 100644 --- a/uts/common/fs/zfs/vdev_disk.c +++ b/uts/common/fs/zfs/vdev_disk.c @@ -168,7 +168,7 @@ vdev_disk_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize, /* * When opening a disk device, we want to preserve the user's original * intent. We always want to open the device by the path the user gave - * us, even if it is one of multiple paths to the save device. But we + * us, even if it is one of multiple paths to the same device. But we * also want to be able to survive disks being removed/recabled. * Therefore the sequence of opening devices is: *