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 #3306, #3321
[zfs.git]
/
module
/
zfs
/
zap_leaf.c
diff --git
a/module/zfs/zap_leaf.c
b/module/zfs/zap_leaf.c
index
19a795d
..
ad21882
100644
(file)
--- a/
module/zfs/zap_leaf.c
+++ b/
module/zfs/zap_leaf.c
@@
-220,7
+220,7
@@
zap_leaf_array_create(zap_leaf_t *l, const char *buf,
uint16_t chunk_head;
uint16_t *chunkp = &chunk_head;
int byten = 0;
uint16_t chunk_head;
uint16_t *chunkp = &chunk_head;
int byten = 0;
- uint64_t value;
+ uint64_t value
= 0
;
int shift = (integer_size-1)*8;
int len = num_integers;
int shift = (integer_size-1)*8;
int len = num_integers;
@@
-341,7
+341,7
@@
zap_leaf_array_match(zap_leaf_t *l, zap_name_t *zn,
ASSERT(zn->zn_key_intlen == sizeof (*thiskey));
thiskey = kmem_alloc(array_numints * sizeof (*thiskey),
ASSERT(zn->zn_key_intlen == sizeof (*thiskey));
thiskey = kmem_alloc(array_numints * sizeof (*thiskey),
- KM_
SLEEP
);
+ KM_
PUSHPAGE
);
zap_leaf_array_read(l, chunk, sizeof (*thiskey), array_numints,
sizeof (*thiskey), array_numints, thiskey);
zap_leaf_array_read(l, chunk, sizeof (*thiskey), array_numints,
sizeof (*thiskey), array_numints, thiskey);
@@
-353,7
+353,7
@@
zap_leaf_array_match(zap_leaf_t *l, zap_name_t *zn,
ASSERT(zn->zn_key_intlen == 1);
if (zn->zn_matchtype == MT_FIRST) {
ASSERT(zn->zn_key_intlen == 1);
if (zn->zn_matchtype == MT_FIRST) {
- char *thisname = kmem_alloc(array_numints, KM_
SLEEP
);
+ char *thisname = kmem_alloc(array_numints, KM_
PUSHPAGE
);
boolean_t match;
zap_leaf_array_read(l, chunk, sizeof (char), array_numints,
boolean_t match;
zap_leaf_array_read(l, chunk, sizeof (char), array_numints,