From e0493936379e19739447684a91de38757190b72e Mon Sep 17 00:00:00 2001 From: avg Date: Tue, 19 Apr 2016 12:14:15 +0000 Subject: [PATCH] MFC r297520: zfs receive: -u can be ignored sometimes PR: 204705 git-svn-id: svn://svn.freebsd.org/base/stable/10@298264 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c index 723cd4299..eb9a9ddb2 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c @@ -3479,7 +3479,8 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, } if (clp) { - err |= changelist_postfix(clp); + if (!flags->nomount) + err |= changelist_postfix(clp); changelist_free(clp); } -- 2.45.0