diff options
| author | Alex Reece <alex@delphix.com> | 2014-12-17 20:57:33 -0800 |
|---|---|---|
| committer | Christopher Siden <chris@delphix.com> | 2014-12-17 20:57:34 -0800 |
| commit | a846f19d279fdfb0e0d63f78ccaf0205a88274d2 (patch) | |
| tree | cb97bec876024c66e8f138ebdf0501a26feade57 /usr/src | |
| parent | 9c30721072b66d89a4f5927ad2f6998d6f96dacb (diff) | |
| download | illumos-joyent-a846f19d279fdfb0e0d63f78ccaf0205a88274d2.tar.gz | |
5422 preserve AVL invariants in dn_dbufs
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Paul Dagnelie <paul.dagnelie@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dnode.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/usr/src/uts/common/fs/zfs/dnode.c b/usr/src/uts/common/fs/zfs/dnode.c index 250dd9f941..3303ee709e 100644 --- a/usr/src/uts/common/fs/zfs/dnode.c +++ b/usr/src/uts/common/fs/zfs/dnode.c @@ -79,16 +79,14 @@ dbuf_compare(const void *x1, const void *x2) return (1); } - if (d1->db_state < d2->db_state) { + if (d1->db_state == DB_SEARCH) { + ASSERT3S(d2->db_state, !=, DB_SEARCH); return (-1); - } - if (d1->db_state > d2->db_state) { + } else if (d2->db_state == DB_SEARCH) { + ASSERT3S(d1->db_state, !=, DB_SEARCH); return (1); } - ASSERT3S(d1->db_state, !=, DB_SEARCH); - ASSERT3S(d2->db_state, !=, DB_SEARCH); - if ((uintptr_t)d1 < (uintptr_t)d2) { return (-1); } |