diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 03:09:10 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 03:09:10 +0200 |
commit | 14595f708eeb528fabcee339ed0b9e0a2ecec73f (patch) | |
tree | e4c8ee1004f6ff445bd058a82791341f7f3301be /fs | |
parent | shm: optimize exit_shm() (diff) | |
parent | ext4: use kzalloc in ext4_kzalloc() (diff) | |
download | linux-14595f708eeb528fabcee339ed0b9e0a2ecec73f.tar.xz linux-14595f708eeb528fabcee339ed0b9e0a2ecec73f.zip |
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()
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e2d88baf91d3..4687fea0c00f 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -124,7 +124,7 @@ void *ext4_kvzalloc(size_t size, gfp_t flags) { void *ret; - ret = kmalloc(size, flags); + ret = kzalloc(size, flags); if (!ret) ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL); return ret; |