summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2014-11-16 04:13:42 +0000
committermarkj <markj@FreeBSD.org>2014-11-16 04:13:42 +0000
commitbafd3cee870206d940f33ef3db01ad0413ef40ae (patch)
treee7bc262ecca79740c0d4f4e6ce796daaf8e08dfc /cddl
parente37e6f308b66649e54d5a5dce66e115059110639 (diff)
downloadFreeBSD-src-bafd3cee870206d940f33ef3db01ad0413ef40ae.zip
FreeBSD-src-bafd3cee870206d940f33ef3db01ad0413ef40ae.tar.gz
Only compare visitation counters if they've both been set for the current
type graph walk. Reviewed by: Robert Mustacchi <rm@joyent.com> MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/tools/ctf/cvt/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
index 27966af..d366f31 100644
--- a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
+++ b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
@@ -349,7 +349,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, equiv_data_t *ed)
int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *);
int mapping;
- if (ctdp->t_emark > ed->ed_clear_mark ||
+ if (ctdp->t_emark > ed->ed_clear_mark &&
mtdp->t_emark > ed->ed_clear_mark)
return (ctdp->t_emark == mtdp->t_emark);
OpenPOWER on IntegriCloud