svn commit: r242730 - in vendor-sys/illumos/dist/uts/common: . fs/zfs

[Martin Matuska]

Author: mm
Date: Thu Nov  8 01:28:39 2012
New Revision: 242730
URL: http://svnweb.freebsd.org/changeset/base/242730

Log:
  Update vendor-sys/illumos/dist to illumos-gate 13866:040f4b0699ee
  (no FreeBSD-relevant changes - illumos issue #3301)

Modified:
  vendor-sys/illumos/dist/uts/common/Makefile.files
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c

Modified: vendor-sys/illumos/dist/uts/common/Makefile.files
==============================================================================
--- vendor-sys/illumos/dist/uts/common/Makefile.files	Thu Nov  8 01:24:06 2012	(r242729)
+++ vendor-sys/illumos/dist/uts/common/Makefile.files	Thu Nov  8 01:28:39 2012	(r242730)
@@ -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.
 #
 
@@ -1944,6 +1944,16 @@ NXGE_HCALL_OBJS =	\
 		nxge_hcall.o
 
 #
+# Virtio modules
+#
+
+# Virtio core
+VIRTIO_OBJS = virtio.o
+
+# Virtio block driver
+VIOBLK_OBJS = vioblk.o
+
+#
 #	kiconv modules
 #
 KICONV_EMEA_OBJS += kiconv_emea.o

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c	Thu Nov  8 01:24:06 2012	(r242729)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_disk.c	Thu Nov  8 01:28:39 2012	(r242730)
@@ -168,7 +168,7 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
 	/*
 	 * 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:
 	 *