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 <mahr...@delphix.com>
Reviewed by: Paul Dagnelie <paul.dagne...@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <josef.si...@nexenta.com>
Reviewed by: Albert Lee <tr...@nexenta.com>
Approved by: Dan McDonald <dan...@omniti.com>
Author: Alex Reece <a...@delphix.com>
illumos/illumos-gate@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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
