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
/
dmu_tx.c
diff --git
a/module/zfs/dmu_tx.c
b/module/zfs/dmu_tx.c
index
81c6dfe
..
47ec4c1
100644
(file)
--- a/
module/zfs/dmu_tx.c
+++ b/
module/zfs/dmu_tx.c
@@
-20,9
+20,8
@@
*/
/*
* 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 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
*/
#include <sys/dmu.h>
*/
#include <sys/dmu.h>
@@
-693,7
+692,7
@@
dmu_tx_hold_zap(dmu_tx_t *tx, uint64_t object, int add, const char *name)
return;
}
return;
}
- ASSERT3
P(dmu_ot[dn->dn_type].ot_byteswap, ==, zap_byteswap
);
+ ASSERT3
U(DMU_OT_BYTESWAP(dn->dn_type), ==, DMU_BSWAP_ZAP
);
if (dn->dn_maxblkid == 0 && !add) {
blkptr_t *bp;
if (dn->dn_maxblkid == 0 && !add) {
blkptr_t *bp;