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

Commit 6ce32846 authored by Namhyung Kim's avatar Namhyung Kim Committed by NeilBrown
Browse files

md/raid5: use kmem_cache_zalloc() 



Replace kmem_cache_alloc + memset(,0,) to kmem_cache_zalloc.
I think it's not harmful since @conf->slab_cache already knows
actual size of struct stripe_head.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent c65060ad

drivers/md/raid5.c

+3 −5
Original line number Diff line number Diff line
@@ -1315,10 +1315,10 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request) 
static int grow_one_stripe(raid5_conf_t *conf)

{

	struct stripe_head *sh;

	sh = kmem_cache_alloc(conf->slab_cache, GFP_KERNEL);

	sh = kmem_cache_zalloc(conf->slab_cache, GFP_KERNEL);

	if (!sh)

		return 0;

	memset(sh, 0, sizeof(*sh) + (conf->pool_size-1)*sizeof(struct r5dev));



	sh->raid_conf = conf;

	spin_lock_init(&sh->lock);

	#ifdef CONFIG_MULTICORE_RAID456
@@ -1435,12 +1435,10 @@ static int resize_stripes(raid5_conf_t *conf, int newsize) 
		return -ENOMEM;



	for (i = conf->max_nr_stripes; i; i--) {

		nsh = kmem_cache_alloc(sc, GFP_KERNEL);

		nsh = kmem_cache_zalloc(sc, GFP_KERNEL);

		if (!nsh)

			break;



		memset(nsh, 0, sizeof(*nsh) + (newsize-1)*sizeof(struct r5dev));



		nsh->raid_conf = conf;

		spin_lock_init(&nsh->lock);

		#ifdef CONFIG_MULTICORE_RAID456