Commit 14595f70 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: use kzalloc in ext4_kzalloc()
parents 298507d4 db9481c0
...@@ -124,7 +124,7 @@ void *ext4_kvzalloc(size_t size, gfp_t flags) ...@@ -124,7 +124,7 @@ void *ext4_kvzalloc(size_t size, gfp_t flags)
{ {
void *ret; void *ret;
ret = kmalloc(size, flags); ret = kzalloc(size, flags);
if (!ret) if (!ret)
ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL); ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment