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
/
zap_micro.c
diff --git
a/module/zfs/zap_micro.c
b/module/zfs/zap_micro.c
index
178ab02
..
3d8cae0
100644
(file)
--- a/
module/zfs/zap_micro.c
+++ b/
module/zfs/zap_micro.c
@@
-20,7
+20,7
@@
*/
/*
* 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) 201
1
by Delphix. All rights reserved.
+ * Copyright (c) 201
2
by Delphix. All rights reserved.
*/
#include <sys/zio.h>
*/
#include <sys/zio.h>
@@
-202,7
+202,7
@@
zap_name_alloc(zap_t *zap, const char *key, matchtype_t mt)
zap_name_t *
zap_name_alloc_uint64(zap_t *zap, const uint64_t *key, int numints)
{
zap_name_t *
zap_name_alloc_uint64(zap_t *zap, const uint64_t *key, int numints)
{
- zap_name_t *zn = kmem_alloc(sizeof (zap_name_t), KM_
SLEEP
);
+ zap_name_t *zn = kmem_alloc(sizeof (zap_name_t), KM_
PUSHPAGE
);
ASSERT(zap->zap_normflags == 0);
zn->zn_zap = zap;
ASSERT(zap->zap_normflags == 0);
zn->zn_zap = zap;
@@
-461,7
+461,7
@@
zap_lockdir(objset_t *os, uint64_t obj, dmu_tx_t *tx,
{
dmu_object_info_t doi;
dmu_object_info_from_db(db, &doi);
{
dmu_object_info_t doi;
dmu_object_info_from_db(db, &doi);
- ASSERT
(dmu_ot[doi.doi_type].ot_byteswap == zap_byteswap
);
+ ASSERT
3U(DMU_OT_BYTESWAP(doi.doi_type), ==, DMU_BSWAP_ZAP
);
}
#endif
}
#endif
@@
-585,7
+585,7
@@
mzap_create_impl(objset_t *os, uint64_t obj, int normflags, zap_flags_t flags,
{
dmu_object_info_t doi;
dmu_object_info_from_db(db, &doi);
{
dmu_object_info_t doi;
dmu_object_info_from_db(db, &doi);
- ASSERT
(dmu_ot[doi.doi_type].ot_byteswap == zap_byteswap
);
+ ASSERT
3U(DMU_OT_BYTESWAP(doi.doi_type), ==, DMU_BSWAP_ZAP
);
}
#endif
}
#endif