Commit 65286b88 authored by Trond Myklebust's avatar Trond Myklebust Committed by Chuck Lever
Browse files

nfsd: export upcalls must not return ESTALE when mountd is down 



If the rpc.mountd daemon goes down, then that should not cause all
exports to start failing with ESTALE errors. Let's explicitly
distinguish between the cache upcall cases that need to time out,
and those that do not.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 6a30e47f

fs/nfs/dns_resolve.c

+6 −5
Original line number Diff line number Diff line
@@ -152,12 +152,13 @@ static int nfs_dns_upcall(struct cache_detail *cd, 
		struct cache_head *ch)

{

	struct nfs_dns_ent *key = container_of(ch, struct nfs_dns_ent, h);

	int ret;



	ret = nfs_cache_upcall(cd, key->hostname);

	if (ret)

		ret = sunrpc_cache_pipe_upcall(cd, ch);

	return ret;

	if (test_and_set_bit(CACHE_PENDING, &ch->flags))

		return 0;

	if (!nfs_cache_upcall(cd, key->hostname))

		return 0;

	clear_bit(CACHE_PENDING, &ch->flags);

	return sunrpc_cache_pipe_upcall_timeout(cd, ch);

}



static int nfs_dns_match(struct cache_head *ca,

fs/nfsd/export.c

+12 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ static void expkey_put(struct kref *ref) 
	kfree_rcu(key, ek_rcu);

}



static int expkey_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall(cd, h);

}



static void expkey_request(struct cache_detail *cd,

			   struct cache_head *h,

			   char **bpp, int *blen)
@@ -254,6 +259,7 @@ static const struct cache_detail svc_expkey_cache_template = { 
	.hash_size	= EXPKEY_HASHMAX,

	.name		= "nfsd.fh",

	.cache_put	= expkey_put,

	.cache_upcall	= expkey_upcall,

	.cache_request	= expkey_request,

	.cache_parse	= expkey_parse,

	.cache_show	= expkey_show,
@@ -335,6 +341,11 @@ static void svc_export_put(struct kref *ref) 
	kfree_rcu(exp, ex_rcu);

}



static int svc_export_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall(cd, h);

}



static void svc_export_request(struct cache_detail *cd,

			       struct cache_head *h,

			       char **bpp, int *blen)
@@ -774,6 +785,7 @@ static const struct cache_detail svc_export_cache_template = { 
	.hash_size	= EXPORT_HASHMAX,

	.name		= "nfsd.export",

	.cache_put	= svc_export_put,

	.cache_upcall	= svc_export_upcall,

	.cache_request	= svc_export_request,

	.cache_parse	= svc_export_parse,

	.cache_show	= svc_export_show,

fs/nfsd/nfs4idmap.c

+14 −0
Original line number Diff line number Diff line
@@ -122,6 +122,12 @@ idtoname_hash(struct ent *ent) 
	return hash;

}



static int

idtoname_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall_timeout(cd, h);

}



static void

idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,

    int *blen)
@@ -184,6 +190,7 @@ static const struct cache_detail idtoname_cache_template = { 
	.hash_size	= ENT_HASHMAX,

	.name		= "nfs4.idtoname",

	.cache_put	= ent_put,

	.cache_upcall	= idtoname_upcall,

	.cache_request	= idtoname_request,

	.cache_parse	= idtoname_parse,

	.cache_show	= idtoname_show,
@@ -295,6 +302,12 @@ nametoid_hash(struct ent *ent) 
	return hash_str(ent->name, ENT_HASHBITS);

}



static int

nametoid_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall_timeout(cd, h);

}



static void

nametoid_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,

    int *blen)
@@ -347,6 +360,7 @@ static const struct cache_detail nametoid_cache_template = { 
	.hash_size	= ENT_HASHMAX,

	.name		= "nfs4.nametoid",

	.cache_put	= ent_put,

	.cache_upcall	= nametoid_upcall,

	.cache_request	= nametoid_request,

	.cache_parse	= nametoid_parse,

	.cache_show	= nametoid_show,

include/linux/sunrpc/cache.h

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ sunrpc_cache_update(struct cache_detail *detail, 


extern int

sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h);

extern int

sunrpc_cache_pipe_upcall_timeout(struct cache_detail *detail,

				 struct cache_head *h);





extern void cache_clean_deferred(void *owner);

net/sunrpc/auth_gss/svcauth_gss.c

+12 −0
Original line number Diff line number Diff line
@@ -180,6 +180,11 @@ static struct cache_head *rsi_alloc(void) 
		return NULL;

}



static int rsi_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall_timeout(cd, h);

}



static void rsi_request(struct cache_detail *cd,

		       struct cache_head *h,

		       char **bpp, int *blen)
@@ -278,6 +283,7 @@ static const struct cache_detail rsi_cache_template = { 
	.hash_size	= RSI_HASHMAX,

	.name           = "auth.rpcsec.init",

	.cache_put      = rsi_put,

	.cache_upcall	= rsi_upcall,

	.cache_request  = rsi_request,

	.cache_parse    = rsi_parse,

	.match		= rsi_match,
@@ -424,6 +430,11 @@ rsc_alloc(void) 
		return NULL;

}



static int rsc_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return -EINVAL;

}



static int rsc_parse(struct cache_detail *cd,

		     char *mesg, int mlen)

{
@@ -550,6 +561,7 @@ static const struct cache_detail rsc_cache_template = { 
	.hash_size	= RSC_HASHMAX,

	.name		= "auth.rpcsec.context",

	.cache_put	= rsc_put,

	.cache_upcall	= rsc_upcall,

	.cache_parse	= rsc_parse,

	.match		= rsc_match,

	.init		= rsc_init,

CRA Git | Maintained and supported by SUSTech CRA and CCSE