Author: avg
Date: Tue Apr 19 12:14:15 2016
New Revision: 298264
URL: https://svnweb.freebsd.org/changeset/base/298264

Log:
  MFC r297520: zfs receive: -u can be ignored sometimes
  
  PR:           204705

Modified:
  stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c      
Tue Apr 19 11:37:43 2016        (r298263)
+++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c      
Tue Apr 19 12:14:15 2016        (r298264)
@@ -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);
        }
 
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to