diff options
author | delphij <delphij@FreeBSD.org> | 2014-08-29 13:03:13 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-08-29 13:03:13 +0000 |
commit | 07021ecc7a8e5e5e41bd992b640d01175c3f7a05 (patch) | |
tree | 577bc859ba7246016eb688f4a1d9153dba6909b9 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c | |
parent | c679006e55ca61e8bf0e161f360cb069e4013bd2 (diff) | |
download | FreeBSD-src-07021ecc7a8e5e5e41bd992b640d01175c3f7a05.zip FreeBSD-src-07021ecc7a8e5e5e41bd992b640d01175c3f7a05.tar.gz |
MFC r270383: MFV r270198:
Instead of using timestamp in the AVL, use the memory address when
comparing.
Illumos issue:
5095 panic when adding a duplicate dbuf to dn_dbufs
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c')
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c index a378601..55bf895 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c @@ -69,33 +69,35 @@ dbuf_compare(const void *x1, const void *x2) if (d1->db_level < d2->db_level) { return (-1); - } else if (d1->db_level > d2->db_level) { + } + if (d1->db_level > d2->db_level) { return (1); } if (d1->db_blkid < d2->db_blkid) { return (-1); - } else if (d1->db_blkid > d2->db_blkid) { + } + if (d1->db_blkid > d2->db_blkid) { return (1); } - /* - * If a dbuf is being evicted while dn_dbufs_mutex is not held, we set - * the db_state to DB_EVICTING but do not remove it from dn_dbufs. If - * another thread creates a dbuf of the same blkid before the dbuf is - * removed from dn_dbufs, we can reach a state where there are two - * dbufs of the same blkid and level in db_dbufs. To maintain the avl - * invariant that there cannot be duplicate items, we distinguish - * between these two dbufs based on the time they were created. - */ - if (d1->db_creation < d2->db_creation) { + if (d1->db_state < d2->db_state) { return (-1); - } else if (d1->db_creation > d2->db_creation) { + } + if (d1->db_state > d2->db_state) { return (1); - } else { - ASSERT3P(d1, ==, d2); - return (0); } + + ASSERT3S(d1->db_state, !=, DB_SEARCH); + ASSERT3S(d2->db_state, !=, DB_SEARCH); + + if ((uintptr_t)d1 < (uintptr_t)d2) { + return (-1); + } + if ((uintptr_t)d1 > (uintptr_t)d2) { + return (1); + } + return (0); } /* ARGSUSED */ |