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

Commit 3015a347 authored by Joonwoo Park's avatar Joonwoo Park Committed by David S. Miller
Browse files

[IPV4] fib_hash: kmalloc + memset conversion to kzalloc 



fib_hash: kmalloc + memset conversion to kzalloc
fix to avoid memset entirely.

Signed-off-by: default avatarJoonwoo Park <joonwpark81@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88f83491

net/ipv4/fib_hash.c

+2 −5
Original line number Diff line number Diff line
@@ -102,10 +102,10 @@ static struct hlist_head *fz_hash_alloc(int divisor) 
	unsigned long size = divisor * sizeof(struct hlist_head);



	if (size <= PAGE_SIZE) {

		return kmalloc(size, GFP_KERNEL);

		return kzalloc(size, GFP_KERNEL);

	} else {

		return (struct hlist_head *)

			__get_free_pages(GFP_KERNEL, get_order(size));

			__get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(size));

	}

}
@@ -174,8 +174,6 @@ static void fn_rehash_zone(struct fn_zone *fz) 
	ht = fz_hash_alloc(new_divisor);



	if (ht)	{

		memset(ht, 0, new_divisor * sizeof(struct hlist_head));



		write_lock_bh(&fib_hash_lock);

		old_ht = fz->fz_hash;

		fz->fz_hash = ht;
@@ -219,7 +217,6 @@ fn_new_zone(struct fn_hash *table, int z) 
		kfree(fz);

		return NULL;

	}

	memset(fz->fz_hash, 0, fz->fz_divisor * sizeof(struct hlist_head *));

	fz->fz_order = z;

	fz->fz_mask = inet_make_mask(z);