[illumos-gate merge]

commit 33915f34e743093758eb5a5065f68a43384af1e8
    3966 zfs lz4 compression (etc) should have bumped grub capability VERSION
commit 2f6d1bc0542b0c28d55d75303ddce8a7be1eb6d2
    3925 IP DCE does not scale (fix sparc)
commit a0c1127b147dc6a0372b141deb8c0c2b0195b8ea
    3973 zfs_ioc_rename alters passed in zc->zc_name
commit 7c6d7024e51780d3aacf9063d2133c1e957d7eea
    3925 IP DCE does not scale

7 files changed, 38 insertions, 20 deletions

diff --git a/usr/src/grub/capability b/usr/src/grub/capability
index 44aaae2cb8..822546819d 100644
--- a/usr/src/grub/capability
+++ b/usr/src/grub/capability
@@ -24,22 +24,12 @@
 # This file defines the current capabilities of GRUB over and above that
 # supported by the standard distribution
 #
-# The version field contains the version of the associated GRUB software.
-# The version is incremented by .1 (minor version number) each time there
-# is a bugfix or enhancement of GRUB. In addition, the major version number
-# is bumped up by 1 every time a release boundary is crossed. Thus if in S11
-# the starting version is 3, in S12 the starting version will be 4.
-# Note that the first major number in each sequence is a whole integer
-# i.e. 2.0 is truncated to 2 and 3.0 is truncated to 3.
-#
-# NOTE: Live Upgrade is currently unable to handle decimal fractions (i.e.
-# minor version numbers) so the version number is being bumped up in
-# integer increments until Live Upgrade is fixed.
-#
-# This file and the associated version are Solaris specific and are
-# not a part of the open source distribution of GRUB.
-#
-VERSION=21
+# The version field contains the version of the associated GRUB software.  The
+# version is incremented by 1 each time there is a bugfix or enhancement to
+# GRUB necessitating that the boot blocks be reinstalled for that fix or
+# enhancement to take effect.
+#
+VERSION=22
 dboot
 xVM
 zfs
diff --git a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c
index bc90f7719a..881ef3fead 100644
--- a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c
+++ b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c
@@ -960,6 +960,9 @@ get_default_bootfsobj(dnode_phys_t *mosmdn, uint64_t *obj, char *stack)
  * List of pool features that the grub implementation of ZFS supports for
  * read. Note that features that are only required for write do not need
  * to be listed here since grub opens pools in read-only mode.
+ *
+ * When this list is updated the version number in usr/src/grub/capability
+ * must be incremented to ensure the new grub gets installed.
  */
 static const char *spa_feature_names[] = {
 	"org.illumos:lz4_compress",
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
index 7a15cd4a40..8032f57d40 100644
--- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c
+++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
@@ -3587,18 +3587,25 @@ zfs_ioc_rename(zfs_cmd_t *zc)
 	at = strchr(zc->zc_name, '@');
 	if (at != NULL) {
 		/* snaps must be in same fs */
+		int error;
+
 		if (strncmp(zc->zc_name, zc->zc_value, at - zc->zc_name + 1))
 			return (SET_ERROR(EXDEV));
 		*at = '\0';
 		if (zc->zc_objset_type == DMU_OST_ZFS) {
-			int error = dmu_objset_find(zc->zc_name,
+			error = dmu_objset_find(zc->zc_name,
 			    recursive_unmount, at + 1,
 			    recursive ? DS_FIND_CHILDREN : 0);
-			if (error != 0)
+			if (error != 0) {
+				*at = '@';
 				return (error);
+			}
 		}
-		return (dsl_dataset_rename_snapshot(zc->zc_name,
-		    at + 1, strchr(zc->zc_value, '@') + 1, recursive));
+		error = dsl_dataset_rename_snapshot(zc->zc_name,
+		    at + 1, strchr(zc->zc_value, '@') + 1, recursive);
+		*at = '@';
+
+		return (error);
 	} else {
 		if (zc->zc_objset_type == DMU_OST_ZVOL)
 			(void) zvol_remove_minor(zc->zc_name);
diff --git a/usr/src/uts/common/inet/ip/ip_dce.c b/usr/src/uts/common/inet/ip/ip_dce.c
index 502ee8a735..a6b9c98cad 100644
--- a/usr/src/uts/common/inet/ip/ip_dce.c
+++ b/usr/src/uts/common/inet/ip/ip_dce.c
@@ -29,6 +29,7 @@
 #include <sys/strsun.h>
 #include <sys/zone.h>
 #include <sys/ddi.h>
+#include <sys/disp.h>
 #include <sys/sunddi.h>
 #include <sys/cmn_err.h>
 #include <sys/debug.h>
diff --git a/usr/src/uts/common/inet/ip/ip_tunables.c b/usr/src/uts/common/inet/ip/ip_tunables.c
index eb0329400b..e1f241d887 100644
--- a/usr/src/uts/common/inet/ip/ip_tunables.c
+++ b/usr/src/uts/common/inet/ip/ip_tunables.c
@@ -22,6 +22,7 @@
  * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
 /* Copyright (c) 1990 Mentat Inc. */
 
diff --git a/usr/src/uts/sparc/ip/ip.global-objs.debug64 b/usr/src/uts/sparc/ip/ip.global-objs.debug64
index 2dfae5d0d7..3098f98265 100644
--- a/usr/src/uts/sparc/ip/ip.global-objs.debug64
+++ b/usr/src/uts/sparc/ip/ip.global-objs.debug64
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved
+# Copyright 2012 Joyent, Inc. All rights reserved
 #
 
 arp_m_tbl
@@ -49,6 +50,10 @@ cl_sctp_listen
 cl_sctp_unlisten
 conn_drain_nthreads
 dce_cache
+dce_reclaim_cv
+dce_reclaim_lock
+dce_reclaim_shutdown
+dce_reclaim_thread
 default_ip6_asp_table
 do_tcp_fusion
 do_tcpzcopy
@@ -106,6 +111,9 @@ ip6_ftable_hash_size
 ip6opt_ls
 ip_cgtp_filter_rev
 ip_conn_cache
+ip_dce_hash_size
+ip_dce_reclaim_interval
+ip_dce_reclaim_threshold_hard
 ip_debug
 ip_g_all_ones
 ip_helper_stream_info
diff --git a/usr/src/uts/sparc/ip/ip.global-objs.obj64 b/usr/src/uts/sparc/ip/ip.global-objs.obj64
index e8210d402c..f182d7198e 100644
--- a/usr/src/uts/sparc/ip/ip.global-objs.obj64
+++ b/usr/src/uts/sparc/ip/ip.global-objs.obj64
@@ -21,6 +21,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2011 Nexenta Systems, Inc. All rights reserved
+# Copyright 2012 Joyent, Inc. All rights reserved
 #
 
 arp_m_tbl
@@ -49,6 +50,10 @@ cl_sctp_listen
 cl_sctp_unlisten
 conn_drain_nthreads
 dce_cache
+dce_reclaim_cv
+dce_reclaim_lock
+dce_reclaim_shutdown
+dce_reclaim_thread
 default_ip6_asp_table
 do_tcp_fusion
 do_tcpzcopy
@@ -106,6 +111,9 @@ ip6_ftable_hash_size
 ip6opt_ls
 ip_cgtp_filter_rev
 ip_conn_cache
+ip_dce_hash_size
+ip_dce_reclaim_interval
+ip_dce_reclaim_threshold_hard
 ip_debug
 ip_g_all_ones
 ip_helper_stream_info