aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/tools
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2014-11-16 04:13:42 +0000
committerMark Johnston <markj@FreeBSD.org>2014-11-16 04:13:42 +0000
commit30ae0e6d6a745b717a9a828e22b7db6ba14d4206 (patch)
treee7bc262ecca79740c0d4f4e6ce796daaf8e08dfc /cddl/contrib/opensolaris/tools
parent980b4d536545de5f1aa9611c49f34af766d92a54 (diff)
downloadsrc-30ae0e6d6a745b717a9a828e22b7db6ba14d4206.tar.gz
src-30ae0e6d6a745b717a9a828e22b7db6ba14d4206.zip
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
Notes
Notes: svn path=/head/; revision=274569
Diffstat (limited to 'cddl/contrib/opensolaris/tools')
-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 27966af0cf50..d366f3182731 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);