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 ddt_object_count() error handling
[zfs.git]
/
module
/
zfs
/
zfs_acl.c
diff --git
a/module/zfs/zfs_acl.c
b/module/zfs/zfs_acl.c
index
df690b3
..
98c0019
100644
(file)
--- a/
module/zfs/zfs_acl.c
+++ b/
module/zfs/zfs_acl.c
@@
-452,7
+452,7
@@
zfs_acl_alloc(int vers)
{
zfs_acl_t *aclp;
{
zfs_acl_t *aclp;
- aclp = kmem_zalloc(sizeof (zfs_acl_t), KM_
SLEEP
);
+ aclp = kmem_zalloc(sizeof (zfs_acl_t), KM_
PUSHPAGE
);
list_create(&aclp->z_acl, sizeof (zfs_acl_node_t),
offsetof(zfs_acl_node_t, z_next));
aclp->z_version = vers;
list_create(&aclp->z_acl, sizeof (zfs_acl_node_t),
offsetof(zfs_acl_node_t, z_next));
aclp->z_version = vers;
@@
-468,9
+468,9
@@
zfs_acl_node_alloc(size_t bytes)
{
zfs_acl_node_t *aclnode;
{
zfs_acl_node_t *aclnode;
- aclnode = kmem_zalloc(sizeof (zfs_acl_node_t), KM_
SLEEP
);
+ aclnode = kmem_zalloc(sizeof (zfs_acl_node_t), KM_
PUSHPAGE
);
if (bytes) {
if (bytes) {
- aclnode->z_acldata = kmem_alloc(bytes, KM_
SLEEP
);
+ aclnode->z_acldata = kmem_alloc(bytes, KM_
PUSHPAGE
);
aclnode->z_allocdata = aclnode->z_acldata;
aclnode->z_allocsize = bytes;
aclnode->z_size = bytes;
aclnode->z_allocdata = aclnode->z_acldata;
aclnode->z_allocsize = bytes;
aclnode->z_size = bytes;