Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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:
wartens2 2008-04-24 17:07:56 +00:00
parent 6e605b6e58
commit 8100fe56f1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/sys/kmem.h
View File

@ -72,14 +72,17 @@ extern int kmem_warning_flag;
\ \
ASSERT(flags & KM_SLEEP); \ ASSERT(flags & KM_SLEEP); \
\ \
_ptr_ = (void *)__vmalloc((size), ((flags) | \ _ptr_ = (void *)__vmalloc((size), (((flags) | \
__GFP_HIGHMEM), PAGE_KERNEL); \ __GFP_HIGHMEM) & \
~__GFP_ZERO), PAGE_KERNEL); \
if (_ptr_ == NULL) { \ if (_ptr_ == NULL) { \
printk("spl: Warning vmem_alloc(%d, 0x%x) failed at %s:%d " \ printk("spl: Warning vmem_alloc(%d, 0x%x) failed at %s:%d " \
"(%ld/%ld)\n", (int)(size), (int)(flags), \ "(%ld/%ld)\n", (int)(size), (int)(flags), \
__FILE__, __LINE__, \ __FILE__, __LINE__, \
atomic64_read(&vmem_alloc_used), vmem_alloc_max); \ atomic64_read(&vmem_alloc_used), vmem_alloc_max); \
} else { \ } else { \
if (flags & __GFP_ZERO) \
memset(_ptr_, 0, (size)); \
atomic64_add((size), &vmem_alloc_used); \ atomic64_add((size), &vmem_alloc_used); \
if (unlikely(atomic64_read(&vmem_alloc_used)>vmem_alloc_max)) \ if (unlikely(atomic64_read(&vmem_alloc_used)>vmem_alloc_max)) \
vmem_alloc_max = atomic64_read(&vmem_alloc_used); \ vmem_alloc_max = atomic64_read(&vmem_alloc_used); \