summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGeorge Melikov <[email protected]>2017-01-26 23:42:48 +0300
committerBrian Behlendorf <[email protected]>2017-01-26 12:42:48 -0800
commit89d43feb0ba1fb86ca67b215c1449b28008a4709 (patch)
tree0fd588bec9eca4ddcd79e6650160a27c255b8cce /lib
parentd96e5439541bce02c44efa56800c022ec9b43aa7 (diff)
OpenZFS 6412 - zfs receive: -u can be ignored sometimes
Authored by: Andriy Gapon <[email protected]> Reviewed by: - Matthew Ahrens <[email protected]> Reviewed by: - Paul Dagnelie <[email protected]> Approved by: - Richard Lowe <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Ported-by: George Melikov <[email protected]> OpenZFS-issue: https://www.illumos.org/issues/6412 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/9185393 Closes #5659
Diffstat (limited to 'lib')
-rw-r--r--lib/libzfs/libzfs_sendrecv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
index b140abe35..a6650a45f 100644
--- a/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@ -3601,7 +3601,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);
}