From 497632587d3b96cea73d10a0d7c4aa91bc5a03bd Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 13 May 2010 22:02:21 +0200 Subject: [PATCH] --- yaml --- r: 196867 b: refs/heads/master c: 2db4e42eaceabec42f738f3895300632cd375e67 h: refs/heads/master i: 196865: 3a53cb2f0da34f959d5227d24cd2a51b393abb31 196863: 85dcddb21b48e32c91a2c401620a6d967a843d9c v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_nl.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 712684c5e16a..97021c90ee60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c3f34516e8c5a1a0ba3585a7777d32bbbdf4ecb +refs/heads/master: 2db4e42eaceabec42f738f3895300632cd375e67 diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index f20336bc59c8..632e3245d1bb 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/drivers/block/drbd/drbd_nl.c @@ -1196,13 +1196,12 @@ static int drbd_nl_net_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, } /* allocation not in the IO path, cqueue thread context */ - new_conf = kmalloc(sizeof(struct net_conf), GFP_KERNEL); + new_conf = kzalloc(sizeof(struct net_conf), GFP_KERNEL); if (!new_conf) { retcode = ERR_NOMEM; goto fail; } - memset(new_conf, 0, sizeof(struct net_conf)); new_conf->timeout = DRBD_TIMEOUT_DEF; new_conf->try_connect_int = DRBD_CONNECT_INT_DEF; new_conf->ping_int = DRBD_PING_INT_DEF;