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
Add snapdev=[hidden|visible] dataset property
[zfs.git]
/
module
/
zfs
/
ddt_zap.c
diff --git
a/module/zfs/ddt_zap.c
b/module/zfs/ddt_zap.c
index
6fb6ea2
..
65b14ab
100644
(file)
--- a/
module/zfs/ddt_zap.c
+++ b/
module/zfs/ddt_zap.c
@@
-62,7
+62,7
@@
ddt_zap_lookup(objset_t *os, uint64_t object, ddt_entry_t *dde)
uint64_t one, csize;
int error;
uint64_t one, csize;
int error;
- cbuf = kmem_alloc(sizeof (dde->dde_phys) + 1, KM_
SLEEP
);
+ cbuf = kmem_alloc(sizeof (dde->dde_phys) + 1, KM_
PUSHPAGE
);
error = zap_length_uint64(os, object, (uint64_t *)&dde->dde_key,
DDT_KEY_WORDS, &one, &csize);
error = zap_length_uint64(os, object, (uint64_t *)&dde->dde_key,
DDT_KEY_WORDS, &one, &csize);
@@
-138,14
+138,10
@@
ddt_zap_walk(objset_t *os, uint64_t object, ddt_entry_t *dde, uint64_t *walk)
return (error);
}
return (error);
}
-static
uint64_
t
-ddt_zap_count(objset_t *os, uint64_t object)
+static
in
t
+ddt_zap_count(objset_t *os, uint64_t object
, uint64_t *count
)
{
{
- uint64_t count = 0;
-
- VERIFY(zap_count(os, object, &count) == 0);
-
- return (count);
+ return zap_count(os, object, count);
}
const ddt_ops_t ddt_zap_ops = {
}
const ddt_ops_t ddt_zap_ops = {