[illumos-gate merge]

commit e119f2433126d4147d64877f8987520e416038e5
    4129 ON tools should honor $MAKE
    4130 cmd/refer Makefile is a bit bogus
    4131 xref hardcodes its path
    4132 ndmp makefiles need to use $(RPCGEN)
    4133 Need a way to specify ast binary directory
commit c50d56f667f119d78fa3d94d6bef2c298ba556f6
    4322 ZFS deadlock on dp_config_rwlock
commit e875b3742255721e9aefe0dd128ed9df3e594be1
    4330 open(2) manual describes O_SYNC twice
commit 39cddb10a31c1c2e66aed69e6871d09caa4c8147
    4128 disks in zpools never go away when pulled
commit b5e595027fe431bb04a0f9b86ceb323a2d702dda
    4294 fopen could support 'x'
commit 9e21aac0c45b9a278df2cfb9d5674c279cc542d2
    4326 powertop sometimes fails silently
commit 241996a3debb0b7690aef018488c76770d83311e
    1872 NULL pointer dereference in iscsit

Conflicts:
	usr/src/uts/common/fs/zfs/vdev_disk.c
	usr/src/tools/scripts/nightly.sh
	usr/src/tools/scripts/bldenv.sh

8 files changed, 39 insertions, 16 deletions

diff --git a/usr/src/cmd/powertop/common/display.c b/usr/src/cmd/powertop/common/display.c
index d54492efe5..9025f646d3 100644
--- a/usr/src/cmd/powertop/common/display.c
+++ b/usr/src/cmd/powertop/common/display.c
@@ -26,6 +26,10 @@
  */
 
 /*
+ * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ */
+
+/*
  * GPL Disclaimer
  *
  * For the avoidance of doubt, except that if any license choice other
@@ -203,6 +207,7 @@ pt_display_setup(boolean_t resized)
 	if (event_lines > 0) {
 		sw[SW_EVENTS] = subwin(stdscr, event_lines, win_cols, pos_y, 0);
 	} else {
+		pt_display_cleanup();
 		(void) printf("\n\nPowerTOP cannot run in such a small "
 		    "terminal window, please resize it.\n\n");
 		exit(EXIT_FAILURE);
diff --git a/usr/src/man/man2/open.2 b/usr/src/man/man2/open.2
index 522ac12e1e..461bcb2742 100644
--- a/usr/src/man/man2/open.2
+++ b/usr/src/man/man2/open.2
@@ -10,7 +10,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH OPEN 2 "Jun 16, 2008"
+.TH OPEN 2 "Nov 16, 2013"
 .SH NAME
 open, openat \- open a file
 .SH SYNOPSIS
@@ -132,12 +132,9 @@ performed on the file-mode bits and the corresponding bits in the complement of
 the process's file mode creation mask. Thus, all bits set in the process's file
 mode creation mask (see \fBumask\fR(2)) are correspondingly cleared in the
 file's permission mask. The "save text image after execution bit" of the mode
-is cleared (see \fBchmod\fR(2)). \fBO_SYNC\fR Write I/O operations on the file
-descriptor complete as defined by synchronized I/O file integrity completion
-(see \fBfcntl.h\fR(3HEAD) definition of \fBO_SYNC\fR.) When bits other than the
-file permission bits are set, the effect is unspecified. The \fImode\fR
-argument does not affect whether the file is open for reading, writing or for
-both.
+is cleared (see \fBchmod\fR(2)). When bits other than the file permission bits
+are set, the effect is unspecified. The \fImode\fR argument does not affect
+whether the file is open for reading, writing or for both.
 .RE
 
 .sp
@@ -304,7 +301,8 @@ file integrity completion.
 .sp .6
 .RS 4n
 Write I/O operations on the file descriptor complete as defined by synchronized
-I/O file integrity completion.
+I/O file integrity completion (see \fBfcntl.h\fR(3HEAD) definition of
+\fBO_SYNC\fR).
 .RE
 
 .sp
diff --git a/usr/src/man/man3c/fopen.3c b/usr/src/man/man3c/fopen.3c
index 0b1f74afc3..2eaaf4dd87 100644
--- a/usr/src/man/man3c/fopen.3c
+++ b/usr/src/man/man3c/fopen.3c
@@ -11,7 +11,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH FOPEN 3C "Apr 18, 2006"
+.TH FOPEN 3C "Nov 06, 2013"
 .SH NAME
 fopen \- open a stream
 .SH SYNOPSIS
diff --git a/usr/src/tools/scripts/bldenv.sh b/usr/src/tools/scripts/bldenv.sh
index 86da8d03b3..9a73aced58 100644
--- a/usr/src/tools/scripts/bldenv.sh
+++ b/usr/src/tools/scripts/bldenv.sh
@@ -273,8 +273,11 @@ if [[ "${SUNWSPRO}" != "" ]]; then
 	export PATH="${SUNWSPRO}/bin:$PATH" 
 fi 
 
-if [[ -n "${MAKE}" ]]; then
-	export PATH="$(dirname ${MAKE}):$PATH"
+if [[ -x "${MAKE}" ]]; then
+	export PATH="$(dirname -- "${MAKE}"):$PATH"
+else
+	print "\$MAKE points to garbage"
+	exit 1	
 fi
 
 TOOLS="${SRC}/tools"
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index bb4f871721..aad678525c 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.sh
@@ -1170,8 +1170,11 @@ DEV_CM="\"@(#)SunOS Internal Development: $LOGNAME $BUILD_DATE [$BASEWSDIR]\""
 export o_FLAG X_FLAG POUND_SIGN RELEASE_DATE DEV_CM
 
 maketype="distributed"
-if [ -z "$MAKE" ]; then
+if [[ -z "$MAKE" ]]; then
 	MAKE=dmake
+elif [[ ! -x "$MAKE" ]]; then
+	echo "\$MAKE is set to garbage in the environment"
+	exit 1	
 fi
 # get the dmake version string alone
 DMAKE_VERSION=$( $MAKE -v )
diff --git a/usr/src/uts/common/fs/zfs/dsl_userhold.c b/usr/src/uts/common/fs/zfs/dsl_userhold.c
index a948e10b12..7f2c26f766 100644
--- a/usr/src/uts/common/fs/zfs/dsl_userhold.c
+++ b/usr/src/uts/common/fs/zfs/dsl_userhold.c
@@ -564,21 +564,23 @@ dsl_dataset_user_release_impl(nvlist_t *holds, nvlist_t *errlist,
 		ddura.ddura_holdfunc = dsl_dataset_hold_obj_string;
 		pool = spa_name(tmpdp->dp_spa);
 #ifdef _KERNEL
-		dsl_pool_config_enter(tmpdp, FTAG);
 		for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
 		    pair = nvlist_next_nvpair(holds, pair)) {
 			dsl_dataset_t *ds;
 
+			dsl_pool_config_enter(tmpdp, FTAG);
 			error = dsl_dataset_hold_obj_string(tmpdp,
 			    nvpair_name(pair), FTAG, &ds);
 			if (error == 0) {
 				char name[MAXNAMELEN];
 				dsl_dataset_name(ds, name);
+				dsl_pool_config_exit(tmpdp, FTAG);
 				dsl_dataset_rele(ds, FTAG);
 				(void) zfs_unmount_snap(name);
+			} else {
+				dsl_pool_config_exit(tmpdp, FTAG);
 			}
 		}
-		dsl_pool_config_exit(tmpdp, FTAG);
 #endif
 	} else {
 		/* Non-temporary holds are specified by name. */
diff --git a/usr/src/uts/common/fs/zfs/vdev_disk.c b/usr/src/uts/common/fs/zfs/vdev_disk.c
index 0f92dad364..c799809a9d 100644
--- a/usr/src/uts/common/fs/zfs/vdev_disk.c
+++ b/usr/src/uts/common/fs/zfs/vdev_disk.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
- * Copyright 2013 Joyent, Inc.  All rights reserved.
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
  */
 
 #include <sys/zfs_context.h>
diff --git a/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c b/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
index 46d4341bc5..810311b7ee 100644
--- a/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
+++ b/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  *
- * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
  */
 
 #include <sys/cpuvar.h>
@@ -2173,6 +2173,18 @@ iscsit_deferred_dispatch(idm_pdu_t *rx_pdu)
 	iscsit_conn_t *ict = rx_pdu->isp_ic->ic_handle;
 
 	/*
+	 * If this isn't a login packet, we need a session.  Otherwise
+	 * this is a protocol error (perhaps one IDM should've caught?).
+	 */
+	if (IDM_PDU_OPCODE(rx_pdu) != ISCSI_OP_LOGIN_CMD &&
+	    ict->ict_sess == NULL) {
+		DTRACE_PROBE2(iscsi__idm__deferred__no__session,
+		    iscsit_conn_t *, ict, idm_pdu_t *, rx_pdu);
+		idm_pdu_complete(rx_pdu, IDM_STATUS_FAIL);
+		return;
+	}
+
+	/*
 	 * If the connection has been lost then ignore new PDU's
 	 */
 	mutex_enter(&ict->ict_mutex);