d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update vendor-sys/illumos/dist to illumos-gate 13866:040f4b0699ee

Browse Source 
(no FreeBSD-relevant changes - illumos issue #3301)
This commit is contained in:
Martin Matuska 2012-11-08 01:28:39 +00:00
parent 73aeb3d88b
commit bb49279388
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
uts/common/Makefile.files
View File

@ -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
#

2
uts/common/fs/zfs/vdev_disk.c
View File

@ -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:
*