Commit d5c3428b authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd: fail module init on reply cache init failure 



If the reply cache initialization fails due to a kmalloc failure,
currently we try to soldier on with a reduced (or nonexistant) reply
cache.

Better to just fail immediately: the failure is then much easier to
understand and debug, and it could save us complexity in some later
code.  (But actually, it doesn't help currently because the cache is
also turned off in some odd failure cases; we should probably find a
better way to handle those failure cases some day.)

Fix some minor style problems while we're at it, and rename
nfsd_cache_init() to remove the need for a comment describing it.

Acked-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 26808d3f

fs/nfsd/nfscache.c

+12 −16
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ static int nfsd_cache_append(struct svc_rqst *rqstp, struct kvec *vec); 
 */

static DEFINE_SPINLOCK(cache_lock);



void

nfsd_cache_init(void)

int nfsd_reply_cache_init(void)

{

	struct svc_cacherep	*rp;

	int			i;
@@ -54,7 +53,8 @@ nfsd_cache_init(void) 
	i = CACHESIZE;

	while (i) {

		rp = kmalloc(sizeof(*rp), GFP_KERNEL);

		if (!rp) break;

		if (!rp)

			goto out_nomem;

		list_add(&rp->c_lru, &lru_head);

		rp->c_state = RC_UNUSED;

		rp->c_type = RC_NOCACHE;
@@ -62,23 +62,19 @@ nfsd_cache_init(void) 
		i--;

	}



	if (i)

		printk (KERN_ERR "nfsd: cannot allocate all %d cache entries, only got %d\n",

			CACHESIZE, CACHESIZE-i);



	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;

	}

	if (!hash_list)

		goto out_nomem;



	cache_disabled = 0;

	return 0;

out_nomem:

	printk(KERN_ERR "nfsd: failed to allocate reply cache\n");

	nfsd_reply_cache_shutdown();

	return -ENOMEM;

}



void

nfsd_cache_shutdown(void)

void nfsd_reply_cache_shutdown(void)

{

	struct svc_cacherep	*rp;

fs/nfsd/nfsctl.c

+7 −4
Original line number Diff line number Diff line
@@ -683,7 +683,9 @@ static int __init init_nfsd(void) 
	if (retval)

		return retval;

	nfsd_stat_init();	/* Statistics */

	nfsd_cache_init();	/* RPC reply cache */

	retval = nfsd_reply_cache_init();

	if (retval)

		goto out_free_stat;

	nfsd_export_init();	/* Exports table */

	nfsd_lockd_init();	/* lockd->nfsd callbacks */

	nfsd_idmap_init();      /* Name to ID mapping */
@@ -700,11 +702,12 @@ static int __init init_nfsd(void) 
out_free_all:

	nfsd_idmap_shutdown();

	nfsd_export_shutdown();

	nfsd_cache_shutdown();

	nfsd_reply_cache_shutdown();

	remove_proc_entry("fs/nfs/exports", NULL);

	remove_proc_entry("fs/nfs", NULL);

	nfsd_stat_shutdown();

	nfsd_lockd_shutdown();

out_free_stat:

	nfsd_stat_shutdown();

	nfsd4_free_slabs();

	return retval;

}
@@ -712,7 +715,7 @@ out_free_all: 
static void __exit exit_nfsd(void)

{

	nfsd_export_shutdown();

	nfsd_cache_shutdown();

	nfsd_reply_cache_shutdown();

	remove_proc_entry("fs/nfs/exports", NULL);

	remove_proc_entry("fs/nfs", NULL);

	nfsd_stat_shutdown();

include/linux/nfsd/cache.h

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ enum { 
 */

#define RC_DELAY		(HZ/5)



void	nfsd_cache_init(void);

void	nfsd_cache_shutdown(void);

int	nfsd_reply_cache_init(void);

void	nfsd_reply_cache_shutdown(void);

int	nfsd_cache_lookup(struct svc_rqst *, int);

void	nfsd_cache_update(struct svc_rqst *, int, __be32 *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE