diff options
| author | avg <avg@FreeBSD.org> | 2016-04-19 12:14:15 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2016-04-19 12:14:15 +0000 |
| commit | d59220bdf7d3648cc9ca738ee5e76cf100f80f5f (patch) | |
| tree | 4522085565ff7ea1e57b42b0dc947147118b3836 | |
| parent | ba53aa0560b6f6d7886d5162ca8e62f5757af8b4 (diff) | |
| download | FreeBSD-src-d59220bdf7d3648cc9ca738ee5e76cf100f80f5f.zip FreeBSD-src-d59220bdf7d3648cc9ca738ee5e76cf100f80f5f.tar.gz | |
MFC r297520: zfs receive: -u can be ignored sometimes
PR: 204705
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c index 723cd42..eb9a9dd 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); } |
