Commit 4b3bb06b authored by Yan Burman's avatar Yan Burman Committed by Linus Torvalds
Browse files

[PATCH] nfsd: replace kmalloc+memset with kcalloc + simplify NULL check 



Replace kmalloc+memset with kcalloc and simplify

Signed-off-by: default avatarYan Burman <burman.yan@gmail.com>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 14d2b59e

fs/nfsd/nfscache.c

+1 −2
Original line number Diff line number Diff line
@@ -66,14 +66,13 @@ nfsd_cache_init(void) 
		printk (KERN_ERR "nfsd: cannot allocate all %d cache entries, only got %d\n",

			CACHESIZE, CACHESIZE-i);



	hash_list = kmalloc (HASHSIZE * sizeof(struct hlist_head), GFP_KERNEL);

	hash_list = kcalloc (HASHSIZE, sizeof(struct hlist_head), GFP_KERNEL);

	if (!hash_list) {

		nfsd_cache_shutdown();

		printk (KERN_ERR "nfsd: cannot allocate %Zd bytes for hash list\n",

			HASHSIZE * sizeof(struct hlist_head));

		return;

	}

	memset(hash_list, 0, HASHSIZE * sizeof(struct hlist_head));



	cache_disabled = 0;

}

fs/nfsd/vfs.c

+18 −19
Original line number Diff line number Diff line
@@ -1885,28 +1885,27 @@ nfsd_racache_init(int cache_size) 
		return 0;

	if (cache_size < 2*RAPARM_HASH_SIZE)

		cache_size = 2*RAPARM_HASH_SIZE;

	raparml = kmalloc(sizeof(struct raparms) * cache_size, GFP_KERNEL);

	raparml = kcalloc(cache_size, sizeof(struct raparms), GFP_KERNEL);



	if (raparml != NULL) {

		dprintk("nfsd: allocating %d readahead buffers.\n",

			cache_size);

	if (!raparml) {

		printk(KERN_WARNING

			"nfsd: Could not allocate memory read-ahead cache.\n");

		return -ENOMEM;

	}



	dprintk("nfsd: allocating %d readahead buffers.\n", cache_size);

	for (i = 0 ; i < RAPARM_HASH_SIZE ; i++) {

		raparm_hash[i].pb_head = NULL;

		spin_lock_init(&raparm_hash[i].pb_lock);

	}

	nperbucket = cache_size >> RAPARM_HASH_BITS;

		memset(raparml, 0, sizeof(struct raparms) * cache_size);

	for (i = 0; i < cache_size - 1; i++) {

		if (i % nperbucket == 0)

			raparm_hash[j++].pb_head = raparml + i;

		if (i % nperbucket < nperbucket-1)

			raparml[i].p_next = raparml + i + 1;

	}

	} else {

		printk(KERN_WARNING

		       "nfsd: Could not allocate memory read-ahead cache.\n");

		return -ENOMEM;

	}



	nfsdstats.ra_size = cache_size;

	return 0;

}