Commit ac534ff2 authored Mar 15, 2013 by Jeff Layton Committed by J. Bruce Fields Mar 18, 2013

nfsd: fix startup order in nfsd_reply_cache_init

If we end up doing "goto out_nomem" in this function, we'll call
nfsd_reply_cache_shutdown. That will attempt to walk the LRU list and
free entries, but that list may not be initialized yet if the server is
starting up for the first time. It's also possible for the shrinker to
kick in before we've initialized the LRU list.

Rearrange the initialization so that the LRU list_head and cache size
are initialized before doing any of the allocations that might fail.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent a517b608

fs/nfsd/nfscache.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -119,6 +119,10 @@ nfsd_reply_cache_free(struct svc_cacherep *rp)

		int nfsd_reply_cache_init(void)
		{
		INIT_LIST_HEAD(&lru_head);
		max_drc_entries = nfsd_cache_size_limit();
		num_drc_entries = 0;

		register_shrinker(&nfsd_reply_cache_shrinker);
		drc_slab = kmem_cache_create("nfsd_drc", sizeof(struct svc_cacherep),
		0, 0, NULL);
		@@ -129,10 +133,6 @@ int nfsd_reply_cache_init(void)
		if (!cache_hash)
		goto out_nomem;

		INIT_LIST_HEAD(&lru_head);
		max_drc_entries = nfsd_cache_size_limit();
		num_drc_entries = 0;

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

Admin message