Module Name: src
Committed By: dsl
Date: Sun Jun 3 10:53:52 UTC 2012
Modified Files:
src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_sendrecv.c
Log Message:
Not sure why this has just started to fail!
But it really isn't a good idea to compare a uint64_t to NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c
diff -u src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c:1.1.1.2 src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c:1.2
--- src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c:1.1.1.2 Sat Feb 27 22:30:28 2010
+++ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c Sun Jun 3 10:53:51 2012
@@ -2245,7 +2245,7 @@ zfs_receive_one(libzfs_handle_t *hdl, in
(void) printf("found clone origin %s\n", zc.zc_string);
}
- stream_wantsnewfs = (drrb->drr_fromguid == NULL ||
+ stream_wantsnewfs = (drrb->drr_fromguid == 0 ||
(drrb->drr_flags & DRR_FLAG_CLONE));
if (stream_wantsnewfs) {
