diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 21:09:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 21:09:10 -0400 |
| commit | 14595f708eeb528fabcee339ed0b9e0a2ecec73f (patch) | |
| tree | e4c8ee1004f6ff445bd058a82791341f7f3301be /fs | |
| parent | 298507d4d2cff2248e84afcf646b697301294442 (diff) | |
| parent | db9481c0476c6475d058ac7ecebb5a822b43cc99 (diff) | |
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) | |||
| 124 | { | 124 | { |
| 125 | void *ret; | 125 | void *ret; |
| 126 | 126 | ||
| 127 | ret = kmalloc(size, flags); | 127 | ret = kzalloc(size, flags); |
| 128 | if (!ret) | 128 | if (!ret) |
| 129 | ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL); | 129 | ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL); |
| 130 | return ret; | 130 | return ret; |