git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Illumos #2619 and #2747
[zfs.git]
/
module
/
zfs
/
dnode_sync.c
diff --git
a/module/zfs/dnode_sync.c
b/module/zfs/dnode_sync.c
index
f2dda86
..
58fa473
100644
(file)
--- a/
module/zfs/dnode_sync.c
+++ b/
module/zfs/dnode_sync.c
@@
-18,8
+18,10
@@
*
* CDDL HEADER END
*/
*
* CDDL HEADER END
*/
+
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
*/
#include <sys/zfs_context.h>
*/
#include <sys/zfs_context.h>
@@
-598,7
+600,7
@@
dnode_sync(dnode_t *dn, dmu_tx_t *tx)
}
if (dn->dn_next_bonustype[txgoff]) {
}
if (dn->dn_next_bonustype[txgoff]) {
- ASSERT(
dn->dn_next_bonustype[txgoff] < DMU_OT_NUMTYPES
);
+ ASSERT(
DMU_OT_IS_VALID(dn->dn_next_bonustype[txgoff])
);
dnp->dn_bonustype = dn->dn_next_bonustype[txgoff];
dn->dn_next_bonustype[txgoff] = 0;
}
dnp->dn_bonustype = dn->dn_next_bonustype[txgoff];
dn->dn_next_bonustype[txgoff] = 0;
}