svn commit: r275914 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Thu Dec 18 18:59:26 2014
New Revision: 275914
URL: https://svnweb.freebsd.org/changeset/base/275914

Log:
  5422 preserve AVL invariants in dn_dbufs
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Paul Dagnelie <paul.dagnelie at delphix.com>
  Reviewed by: Josef 'Jeff' Sipek <josef.sipek at nexenta.com>
  Reviewed by: Albert Lee <trisk at nexenta.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Alex Reece <alex at delphix.com>
  
  illumos/illumos-gate at a846f19d279fdfb0e0d63f78ccaf0205a88274d2

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c	Thu Dec 18 18:46:08 2014	(r275913)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dnode.c	Thu Dec 18 18:59:26 2014	(r275914)
@@ -79,16 +79,14 @@ dbuf_compare(const void *x1, const void 
 		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);
 	}