Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db4e42e authored by Julia Lawall's avatar Julia Lawall Committed by Philipp Reisner
Browse files

drivers/block/drbd: Use kzalloc 

Use kzalloc rather than the combination of kmalloc and memset.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression x,size,flags;
statement S;
@@

-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
 if (x == NULL) S
-memset(x, 0, size);
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 0c3f3451

drivers/block/drbd/drbd_nl.c

+1 −2
Original line number Diff line number Diff line
@@ -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;