From: Alex Reece <alex@delphix.com>
Date: Wed, 6 May 2015 17:08:25 +0000 (+1000)
Subject: Illumos 5422 - preserve AVL invariants in dn_dbufs
X-Git-Tag: zfs-0.6.5~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7224c67fea3c427ab0d5bafb6d7fba32a7a592d9;p=zfs

Illumos 5422 - preserve AVL invariants in dn_dbufs

Author: Alex Reece <alex@delphix.com>
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>

References:
  https://www.illumos.org/issues/5422
  https://github.com/illumos/illumos-gate/commit/a846f19

Ported-by: Chris Dunlop <chris@onthe.net.au>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3381
---

diff --git a/module/zfs/dnode.c b/module/zfs/dnode.c
index e1ea165aa..6865cd01e 100644
--- a/module/zfs/dnode.c
+++ b/module/zfs/dnode.c
@@ -83,16 +83,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);
 	}