leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SUNRPC: introduce cache_detail->cache_request callback

Browse Source 
This callback will allow to simplify upcalls in further patches in this
series.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Stanislav Kinsbursky 2013-02-04 14:02:45 +03:00 committed by J. Bruce Fields
parent 462b8f6bf1
commit 73fb847a44
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/dns_resolve.c
View File

@ -144,7 +144,7 @@ static int nfs_dns_upcall(struct cache_detail *cd,
ret = nfs_cache_upcall(cd, key->hostname);
if (ret)
ret = sunrpc_cache_pipe_upcall(cd, ch, nfs_dns_request);
ret = sunrpc_cache_pipe_upcall(cd, ch, cd->cache_request);
return ret;
}
@ -359,6 +359,7 @@ static struct cache_detail nfs_dns_resolve_template = {
.name = "dns_resolve",
.cache_put = nfs_dns_ent_put,
.cache_upcall = nfs_dns_upcall,
.cache_request = nfs_dns_request,
.cache_parse = nfs_dns_parse,
.cache_show = nfs_dns_show,
.match = nfs_dns_match,

6
fs/nfsd/export.c
View File

@ -69,7 +69,7 @@ static void expkey_request(struct cache_detail *cd,
static int expkey_upcall(struct cache_detail *cd, struct cache_head *h)
{
return sunrpc_cache_pipe_upcall(cd, h, expkey_request);
return sunrpc_cache_pipe_upcall(cd, h, cd->cache_request);
}
static struct svc_expkey *svc_expkey_update(struct cache_detail *cd, struct svc_expkey *new,
@ -246,6 +246,7 @@ static struct cache_detail svc_expkey_cache_template = {
.name = "nfsd.fh",
.cache_put = expkey_put,
.cache_upcall = expkey_upcall,
.cache_request = expkey_request,
.cache_parse = expkey_parse,
.cache_show = expkey_show,
.match = expkey_match,
@ -340,7 +341,7 @@ static void svc_export_request(struct cache_detail *cd,
static int svc_export_upcall(struct cache_detail *cd, struct cache_head *h)
{
return sunrpc_cache_pipe_upcall(cd, h, svc_export_request);
return sunrpc_cache_pipe_upcall(cd, h, cd->cache_request);
}
static struct svc_export *svc_export_update(struct svc_export *new,
@ -714,6 +715,7 @@ static struct cache_detail svc_export_cache_template = {
.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,
.match = svc_export_match,

6
fs/nfsd/nfs4idmap.c
View File

@ -142,7 +142,7 @@ idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
static int
idtoname_upcall(struct cache_detail *cd, struct cache_head *ch)
{
return sunrpc_cache_pipe_upcall(cd, ch, idtoname_request);
return sunrpc_cache_pipe_upcall(cd, ch, cd->cache_request);
}
static int
@ -193,6 +193,7 @@ static struct cache_detail idtoname_cache_template = {
.name = "nfs4.idtoname",
.cache_put = ent_put,
.cache_upcall = idtoname_upcall,
.cache_request = idtoname_request,
.cache_parse = idtoname_parse,
.cache_show = idtoname_show,
.warn_no_listener = warn_no_idmapd,
@ -323,7 +324,7 @@ nametoid_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
static int
nametoid_upcall(struct cache_detail *cd, struct cache_head *ch)
{
return sunrpc_cache_pipe_upcall(cd, ch, nametoid_request);
return sunrpc_cache_pipe_upcall(cd, ch, cd->cache_request);
}
static int
@ -366,6 +367,7 @@ static struct cache_detail nametoid_cache_template = {
.name = "nfs4.nametoid",
.cache_put = ent_put,
.cache_upcall = nametoid_upcall,
.cache_request = nametoid_request,
.cache_parse = nametoid_parse,
.cache_show = nametoid_show,
.warn_no_listener = warn_no_idmapd,

4
include/linux/sunrpc/cache.h
View File

@ -83,6 +83,10 @@ struct cache_detail {
int (*cache_upcall)(struct cache_detail *,
struct cache_head *);
void (*cache_request)(struct cache_detail *cd,
struct cache_head *ch,
char **bpp, int *blen);
int (*cache_parse)(struct cache_detail *,
char *buf, int len);

3
net/sunrpc/auth_gss/svcauth_gss.c
View File

@ -184,7 +184,7 @@ static void rsi_request(struct cache_detail *cd,
static int rsi_upcall(struct cache_detail *cd, struct cache_head *h)
{
return sunrpc_cache_pipe_upcall(cd, h, rsi_request);
return sunrpc_cache_pipe_upcall(cd, h, cd->cache_request);
}
@ -276,6 +276,7 @@ static struct cache_detail rsi_cache_template = {
.name = "auth.rpcsec.init",
.cache_put = rsi_put,
.cache_upcall = rsi_upcall,
.cache_request = rsi_request,
.cache_parse = rsi_parse,
.match = rsi_match,
.init = rsi_init,

6
net/sunrpc/svcauth_unix.c
View File

@ -159,7 +159,7 @@ static void ip_map_request(struct cache_detail *cd,
static int ip_map_upcall(struct cache_detail *cd, struct cache_head *h)
{
return sunrpc_cache_pipe_upcall(cd, h, ip_map_request);
return sunrpc_cache_pipe_upcall(cd, h, cd->cache_request);
}
static struct ip_map *__ip_map_lookup(struct cache_detail *cd, char *class, struct in6_addr *addr);
@ -472,7 +472,7 @@ static void unix_gid_request(struct cache_detail *cd,
static int unix_gid_upcall(struct cache_detail *cd, struct cache_head *h)
{
return sunrpc_cache_pipe_upcall(cd, h, unix_gid_request);
return sunrpc_cache_pipe_upcall(cd, h, cd->cache_request);
}
static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, uid_t uid);
@ -578,6 +578,7 @@ static struct cache_detail unix_gid_cache_template = {
.name = "auth.unix.gid",
.cache_put = unix_gid_put,
.cache_upcall = unix_gid_upcall,
.cache_request = unix_gid_request,
.cache_parse = unix_gid_parse,
.cache_show = unix_gid_show,
.match = unix_gid_match,
@ -875,6 +876,7 @@ static struct cache_detail ip_map_cache_template = {
.name = "auth.unix.ip",
.cache_put = ip_map_put,
.cache_upcall = ip_map_upcall,
.cache_request = ip_map_request,
.cache_parse = ip_map_parse,
.cache_show = ip_map_show,
.match = ip_map_match,