diff options
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index f20336bc59c8..632e3245d1bb 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/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, | |||
| 1196 | } | 1196 | } |
| 1197 | 1197 | ||
| 1198 | /* allocation not in the IO path, cqueue thread context */ | 1198 | /* allocation not in the IO path, cqueue thread context */ |
| 1199 | new_conf = kmalloc(sizeof(struct net_conf), GFP_KERNEL); | 1199 | new_conf = kzalloc(sizeof(struct net_conf), GFP_KERNEL); |
| 1200 | if (!new_conf) { | 1200 | if (!new_conf) { |
| 1201 | retcode = ERR_NOMEM; | 1201 | retcode = ERR_NOMEM; |
| 1202 | goto fail; | 1202 | goto fail; |
| 1203 | } | 1203 | } |
| 1204 | 1204 | ||
| 1205 | memset(new_conf, 0, sizeof(struct net_conf)); | ||
| 1206 | new_conf->timeout = DRBD_TIMEOUT_DEF; | 1205 | new_conf->timeout = DRBD_TIMEOUT_DEF; |
| 1207 | new_conf->try_connect_int = DRBD_CONNECT_INT_DEF; | 1206 | new_conf->try_connect_int = DRBD_CONNECT_INT_DEF; |
| 1208 | new_conf->ping_int = DRBD_PING_INT_DEF; | 1207 | new_conf->ping_int = DRBD_PING_INT_DEF; |
