From: Mariusz Kozlowski fs/reiser4/ktxnmgrd.c | 5314 -> 5277 (-37 bytes) fs/reiser4/ktxnmgrd.o | 131624 -> 131496 (-128 bytes) Signed-off-by: Mariusz Kozlowski Cc: Edward Shishkin Cc: "Vladimir V. Saveliev" Signed-off-by: Andrew Morton --- fs/reiser4/ktxnmgrd.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff -puN fs/reiser4/ktxnmgrd.c~fs-reiser4-ktxnmgrdc-kmalloc-memset-conversion-to-kzalloc fs/reiser4/ktxnmgrd.c --- a/fs/reiser4/ktxnmgrd.c~fs-reiser4-ktxnmgrdc-kmalloc-memset-conversion-to-kzalloc +++ a/fs/reiser4/ktxnmgrd.c @@ -130,13 +130,12 @@ int reiser4_init_ktxnmgrd(struct super_b assert("zam-1014", mgr->daemon == NULL); - ctx = kmalloc(sizeof(ktxnmgrd_context), reiser4_ctx_gfp_mask_get()); - if (ctx == NULL) + ctx = kzalloc(sizeof(ktxnmgrd_context), reiser4_ctx_gfp_mask_get()); + if (!ctx) return RETERR(-ENOMEM); assert("nikita-2442", ctx != NULL); - memset(ctx, 0, sizeof *ctx); init_waitqueue_head(&ctx->wait); /*kcond_init(&ctx->startup);*/ _