lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

md/raid5: use kmem_cache_zalloc()

Browse Source 
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: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Namhyung Kim
2011-07-18 17:38:50 +10:00
committed by NeilBrown
parent c65060ad42
commit 6ce328462c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/md/raid5.c
View File

@@ -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) static int grow_one_stripe(raid5_conf_t *conf)
{ {
struct stripe_head *sh; struct stripe_head *sh;
sh = kmem_cache_alloc(conf->slab_cache, GFP_KERNEL); sh = kmem_cache_zalloc(conf->slab_cache, GFP_KERNEL);
if (!sh) if (!sh)
return 0; return 0;
memset(sh, 0, sizeof(*sh) + (conf->pool_size-1)*sizeof(struct r5dev));
sh->raid_conf = conf; sh->raid_conf = conf;
spin_lock_init(&sh->lock); spin_lock_init(&sh->lock);
#ifdef CONFIG_MULTICORE_RAID456 #ifdef CONFIG_MULTICORE_RAID456
@@ -1435,12 +1435,10 @@ static int resize_stripes(raid5_conf_t *conf, int newsize)
return -ENOMEM; return -ENOMEM;
for (i = conf->max_nr_stripes; i; i--) { for (i = conf->max_nr_stripes; i; i--) {
nsh = kmem_cache_alloc(sc, GFP_KERNEL); nsh = kmem_cache_zalloc(sc, GFP_KERNEL);
if (!nsh) if (!nsh)
break; break;
memset(nsh, 0, sizeof(*nsh) + (newsize-1)*sizeof(struct r5dev));
nsh->raid_conf = conf; nsh->raid_conf = conf;
spin_lock_init(&nsh->lock); spin_lock_init(&nsh->lock);
#ifdef CONFIG_MULTICORE_RAID456 #ifdef CONFIG_MULTICORE_RAID456