mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-11-17 10:01:01 +03:00
Make sure that when calling __vmem_alloc that we
do not have __GFP_ZERO set. Once the memory is allocated then zero out the memory if __GFP_ZERO is passed to __vmem_alloc. git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@88 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
This commit is contained in:
parent
6e605b6e58
commit
8100fe56f1
@ -72,14 +72,17 @@ extern int kmem_warning_flag;
|
||||
\
|
||||
ASSERT(flags & KM_SLEEP); \
|
||||
\
|
||||
_ptr_ = (void *)__vmalloc((size), ((flags) | \
|
||||
__GFP_HIGHMEM), PAGE_KERNEL); \
|
||||
_ptr_ = (void *)__vmalloc((size), (((flags) | \
|
||||
__GFP_HIGHMEM) & \
|
||||
~__GFP_ZERO), PAGE_KERNEL); \
|
||||
if (_ptr_ == NULL) { \
|
||||
printk("spl: Warning vmem_alloc(%d, 0x%x) failed at %s:%d " \
|
||||
"(%ld/%ld)\n", (int)(size), (int)(flags), \
|
||||
__FILE__, __LINE__, \
|
||||
atomic64_read(&vmem_alloc_used), vmem_alloc_max); \
|
||||
} else { \
|
||||
if (flags & __GFP_ZERO) \
|
||||
memset(_ptr_, 0, (size)); \
|
||||
atomic64_add((size), &vmem_alloc_used); \
|
||||
if (unlikely(atomic64_read(&vmem_alloc_used)>vmem_alloc_max)) \
|
||||
vmem_alloc_max = atomic64_read(&vmem_alloc_used); \
|
||||
|
Loading…
Reference in New Issue
Block a user