diff options
Diffstat (limited to 'fs/jffs2/malloc.c')
-rw-r--r-- | fs/jffs2/malloc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c index f9211252b5f1..9eff2bdae8a7 100644 --- a/fs/jffs2/malloc.c +++ b/fs/jffs2/malloc.c | |||
@@ -284,10 +284,9 @@ void jffs2_free_inode_cache(struct jffs2_inode_cache *x) | |||
284 | struct jffs2_xattr_datum *jffs2_alloc_xattr_datum(void) | 284 | struct jffs2_xattr_datum *jffs2_alloc_xattr_datum(void) |
285 | { | 285 | { |
286 | struct jffs2_xattr_datum *xd; | 286 | struct jffs2_xattr_datum *xd; |
287 | xd = kmem_cache_alloc(xattr_datum_cache, GFP_KERNEL); | 287 | xd = kmem_cache_zalloc(xattr_datum_cache, GFP_KERNEL); |
288 | dbg_memalloc("%p\n", xd); | 288 | dbg_memalloc("%p\n", xd); |
289 | 289 | ||
290 | memset(xd, 0, sizeof(struct jffs2_xattr_datum)); | ||
291 | xd->class = RAWNODE_CLASS_XATTR_DATUM; | 290 | xd->class = RAWNODE_CLASS_XATTR_DATUM; |
292 | xd->node = (void *)xd; | 291 | xd->node = (void *)xd; |
293 | INIT_LIST_HEAD(&xd->xindex); | 292 | INIT_LIST_HEAD(&xd->xindex); |
@@ -303,10 +302,9 @@ void jffs2_free_xattr_datum(struct jffs2_xattr_datum *xd) | |||
303 | struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void) | 302 | struct jffs2_xattr_ref *jffs2_alloc_xattr_ref(void) |
304 | { | 303 | { |
305 | struct jffs2_xattr_ref *ref; | 304 | struct jffs2_xattr_ref *ref; |
306 | ref = kmem_cache_alloc(xattr_ref_cache, GFP_KERNEL); | 305 | ref = kmem_cache_zalloc(xattr_ref_cache, GFP_KERNEL); |
307 | dbg_memalloc("%p\n", ref); | 306 | dbg_memalloc("%p\n", ref); |
308 | 307 | ||
309 | memset(ref, 0, sizeof(struct jffs2_xattr_ref)); | ||
310 | ref->class = RAWNODE_CLASS_XATTR_REF; | 308 | ref->class = RAWNODE_CLASS_XATTR_REF; |
311 | ref->node = (void *)ref; | 309 | ref->node = (void *)ref; |
312 | return ref; | 310 | return ref; |