[illumos-gate merge]

commit 2e67aa296fc3707ae8e2b532f67387daf0823499
    6589 prototypes should bid farewell to 2015
commit 1a7f23d927dad680fa43ca65ed7f86adf49032e2
    6595 sdev's devfsadm macros set a bad precedent
commit 751609474e831927e5706b37cb08160df31dcd4d
    6568 zfs_allow_010_pos and zfs_allow_012_neg fail intermittently

14 files changed, 38 insertions, 101 deletions

diff --git a/usr/src/prototypes/prototype.Makefile b/usr/src/prototypes/prototype.Makefile
index b8bbfc787a..c128af316e 100644
--- a/usr/src/prototypes/prototype.Makefile
+++ b/usr/src/prototypes/prototype.Makefile
@@ -10,6 +10,6 @@
 #
 
 #
-# Copyright 2015 <contributor>
+# Copyright 2016 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.c b/usr/src/prototypes/prototype.c
index 04dd7f996b..04cc383267 100644
--- a/usr/src/prototypes/prototype.c
+++ b/usr/src/prototypes/prototype.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2015 <contributor>
+ * Copyright 2016 <contributor>
  */
 
 /*
diff --git a/usr/src/prototypes/prototype.csh b/usr/src/prototypes/prototype.csh
index 23cfc7ed49..e5e9bbdab6 100644
--- a/usr/src/prototypes/prototype.csh
+++ b/usr/src/prototypes/prototype.csh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2015 <contributor>
+# Copyright 2016 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.h b/usr/src/prototypes/prototype.h
index 690ce7a43a..490f41d5e8 100644
--- a/usr/src/prototypes/prototype.h
+++ b/usr/src/prototypes/prototype.h
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2015 <contributor>
+ * Copyright 2016 <contributor>
  */
 
 #ifndef _PROTOTYPE_H
diff --git a/usr/src/prototypes/prototype.java b/usr/src/prototypes/prototype.java
index fb95a5e186..5035f7b4b3 100644
--- a/usr/src/prototypes/prototype.java
+++ b/usr/src/prototypes/prototype.java
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2015 <contributor>
+ * Copyright 2016 <contributor>
  */
 
 /*
diff --git a/usr/src/prototypes/prototype.ksh b/usr/src/prototypes/prototype.ksh
index cd8b52d172..3598a8cfa0 100644
--- a/usr/src/prototypes/prototype.ksh
+++ b/usr/src/prototypes/prototype.ksh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2015 <contributor>
+# Copyright 2016 <contributor>
 #
 
diff --git a/usr/src/prototypes/prototype.man b/usr/src/prototypes/prototype.man
index f6b4ed3193..d1b37a4d2a 100644
--- a/usr/src/prototypes/prototype.man
+++ b/usr/src/prototypes/prototype.man
@@ -9,5 +9,5 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2015 <contributor>
+.\" Copyright 2016 <contributor>
 .\"
diff --git a/usr/src/prototypes/prototype.mapfile-vers b/usr/src/prototypes/prototype.mapfile-vers
index a44df8b560..2f9faf35ec 100644
--- a/usr/src/prototypes/prototype.mapfile-vers
+++ b/usr/src/prototypes/prototype.mapfile-vers
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2015 <contributor>
+# Copyright 2016 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.pl b/usr/src/prototypes/prototype.pl
index 41444b1a6e..79f73dc897 100644
--- a/usr/src/prototypes/prototype.pl
+++ b/usr/src/prototypes/prototype.pl
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2015 <contributor>
+# Copyright 2016 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.py b/usr/src/prototypes/prototype.py
index 29e57915cb..a54531cca1 100644
--- a/usr/src/prototypes/prototype.py
+++ b/usr/src/prototypes/prototype.py
@@ -11,7 +11,7 @@
 #
 
 #
-# Copyright 2015 <contributor>
+# Copyright 2016 <contributor>
 #
 
 #
diff --git a/usr/src/prototypes/prototype.s b/usr/src/prototypes/prototype.s
index 25e94ad8c6..1d308a92c6 100644
--- a/usr/src/prototypes/prototype.s
+++ b/usr/src/prototypes/prototype.s
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2015 <contributor>
+ * Copyright 2016 <contributor>
  */
 
 	.file	"prototype.s"
diff --git a/usr/src/prototypes/prototype.sh b/usr/src/prototypes/prototype.sh
index 94be3d59dd..5b1e51e0a8 100644
--- a/usr/src/prototypes/prototype.sh
+++ b/usr/src/prototypes/prototype.sh
@@ -12,6 +12,6 @@
 #
 
 #
-# Copyright 2015 <contributor>
+# Copyright 2016 <contributor>
 #
 
diff --git a/usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib b/usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
index e6c8cf9d67..57b55cab50 100644
--- a/usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
+++ b/usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
@@ -26,6 +26,7 @@
 
 #
 # Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright 2016 Nexenta Systems, Inc.
 #
 
 . $STF_SUITE/include/libtest.shlib
@@ -918,58 +919,26 @@ function verify_fs_share
 	typeset user=$1
 	typeset perm=$2
 	typeset fs=$3
+	typeset -i ret=0
 
-	typeset stamp=${perm}.${user}.$($DATE +'%F-%H%M%S')
-	typeset mntpt=$(get_prop mountpoint $fs)
-
+	$SVCADM enable -rs nfs/server
 	typeset stat=$($SVCS -H -o STA nfs/server:default)
 	if [[ $stat != "ON" ]]; then
-		log_note "Current nfs/server status: $stat"
-		# legacy share
-		user_run $user $SHARE $mntpt
-		if is_shared $fs; then
-			return 1
-		fi
-
-		# sharenfs=on
-		log_must $ZFS set sharenfs=on $fs
-		user_run $user $ZFS share $fs
-		if is_shared $fs; then
-			log_must $ZFS set sharenfs=off $fs
-			return 1
-		fi
-		log_must $ZFS set sharenfs=off $fs
-	fi
-
-	# turn on nfs/server service if it is not enabled
-	typeset tmpshare=/var/tmp/a.$$
-	$RM -rf $tmpshare
-
-	log_must $MKDIR -p $tmpshare
-	log_must $SHARE $tmpshare
-
-	# legacy share
-	user_run $user $SHARE $mntpt
-	if ! is_shared $fs ; then
-		log_must $UNSHARE $tmpshare
-		log_must $RM -rf $tmpshare
-		return 1
+		log_fail "Could not enable nfs/server"
 	fi
-	log_must $UNSHARE $mntpt
 
-	# sharenfs=on
 	log_must $ZFS set sharenfs=on $fs
+	$ZFS unshare $fs
+
 	user_run $user $ZFS share $fs
 	if ! is_shared $fs; then
-		log_must $UNSHARE $tmpshare
-		log_must $RM -rf $tmpshare
-		return 1
+		ret=1
 	fi
 
-	log_must $UNSHARE $tmpshare
-	log_must $RM -rf $tmpshare
+	$ZFS unshare $fs
+	log_must $ZFS set sharenfs=off $fs
 
-	return 0
+	return $ret
 }
 
 function verify_fs_mountpoint
@@ -1318,59 +1287,27 @@ function verify_fs_sharenfs
 	typeset user=$1
 	typeset perm=$2
 	typeset fs=$3
+	typeset nmode omode
 
-	typeset oldval
-	set -A modes "on" "off"
-	oldval=$(get_prop $perm $fs)
-	if [[ $oldval == "on" ]]; then
-		n=1
-	elif [[ $oldval == "off" ]]; then
-		n=0
-	fi
-	log_note "$user $ZFS set $perm=${modes[$n]} $fs"
-	user_run $user $ZFS set $perm=${modes[$n]} $fs
-	if [[ ${modes[$n]} != $(get_prop $perm $fs) ]]; then
-		return 1
-	fi
-	log_must $ZFS set $perm=$oldval $fs
-
-	# turn on nfs/server service if it is not enabled
-	typeset tmpshare=/var/tmp/a.$$
-	$RM -rf $tmpshare
-	log_must $MKDIR -p $tmpshare
-	log_must $SHARE $tmpshare
-
-	log_note "$user $ZFS set $perm=${modes[$n]} $fs"
-	user_run $user $ZFS set $perm=${modes[$n]} $fs
-	if [[ ${modes[$n]} != $(get_prop $perm $fs) ]]; then
-		return 1
-	fi
-
-	user_run $user $ZFS share $fs
-	if is_shared $fs; then
-		return 1
+	omode=$(get_prop $perm $fs)
+	if [[ $omode == "off" ]]; then
+		nmode="on"
+	else
+		nmode="off"
 	fi
 
-	# share permission is needed
-	log_must $ZFS allow $user share $fs
-	user_run $user $ZFS share $fs
-	log_must $ZFS unallow $user share $fs
-
-	if [[ $n -eq 0 ]] && ! is_shared $fs ; then
-		log_must $UNSHARE $tmpshare
-		log_must $RM -rf $tmpshare
+	log_note "$user $ZFS set $perm=$nmode $fs"
+	user_run $user $ZFS set $perm=$nmode $fs
+	if [[ $(get_prop $perm $fs) != $nmode ]]; then
 		return 1
 	fi
 
-	if [[ $n -eq 1 ]] && is_shared $fs ; then
-		log_must $UNSHARE $tmpshare
-		log_must $RM -rf $tmpshare
+	log_note "$user $ZFS set $perm=$omode $fs"
+	user_run $user $ZFS set $perm=$omode $fs
+	if [[ $(get_prop $perm $fs) != $omode ]]; then
 		return 1
 	fi
 
-	log_must $UNSHARE $tmpshare
-	log_must $RM -rf $tmpshare
-
 	return 0
 }
 
diff --git a/usr/src/uts/common/sys/fs/sdev_impl.h b/usr/src/uts/common/sys/fs/sdev_impl.h
index 240a53b037..644fda0482 100644
--- a/usr/src/uts/common/sys/fs/sdev_impl.h
+++ b/usr/src/uts/common/sys/fs/sdev_impl.h
@@ -330,13 +330,13 @@ typedef enum {
 extern volatile uint_t  devfsadm_state; /* atomic mask for devfsadm status */
 
 #define	DEVNAME_DEVFSADM_SET_RUNNING(devfsadm_state)	\
-	devfsadm_state = DEVNAME_DEVFSADM_RUNNING
+	(devfsadm_state = DEVNAME_DEVFSADM_RUNNING)
 #define	DEVNAME_DEVFSADM_SET_STOP(devfsadm_state)	\
-	devfsadm_state = DEVNAME_DEVFSADM_STOPPED
+	(devfsadm_state = DEVNAME_DEVFSADM_STOPPED)
 #define	DEVNAME_DEVFSADM_SET_RUN(devfsadm_state)	\
-	devfsadm_state = DEVNAME_DEVFSADM_RUN
+	(devfsadm_state = DEVNAME_DEVFSADM_RUN)
 #define	DEVNAME_DEVFSADM_IS_RUNNING(devfsadm_state)	\
-	devfsadm_state == DEVNAME_DEVFSADM_RUNNING
+	(devfsadm_state == DEVNAME_DEVFSADM_RUNNING)
 #define	DEVNAME_DEVFSADM_HAS_RUN(devfsadm_state)	\
 	(devfsadm_state == DEVNAME_DEVFSADM_RUN)