svn commit: r297520 - head/cddl/contrib/opensolaris/lib/libzfs/common

[Andriy Gapon]

Author: avg
Date: Sun Apr  3 07:40:33 2016
New Revision: 297520
URL: https://svnweb.freebsd.org/changeset/base/297520

Log:
  zfs receive: -u can be ignored sometimes
  
  When force-receiving a filesystem that was already mounted the re-created
  filesystem is mounted despite -u flag.
  
  Also see https://www.illumos.org/issues/6412.
  
  PR:		204705
  Tested by:	Vladimir Krstulja <vlad-fbsd at acheronmedia.com>
  MFC after:	2 weeks
  X-Needs-Upstreaming:	illumos

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Sun Apr  3 06:33:16 2016	(r297519)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Sun Apr  3 07:40:33 2016	(r297520)
@@ -3479,7 +3479,8 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 	}
 
 	if (clp) {
-		err |= changelist_postfix(clp);
+		if (!flags->nomount)
+			err |= changelist_postfix(clp);
 		changelist_free(clp);
 	}