Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfsd: make name-to-id cache allocated per network namespace context

Browse Source 
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Stanislav Kinsbursky 2012-04-11 17:32:58 +04:00 committed by J. Bruce Fields
parent c2e76ef5e0
commit 9e75a4dee0
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/netns.h
View File

@ -33,7 +33,7 @@ struct nfsd_net {
struct cache_detail *svc_export_cache; struct cache_detail *svc_export_cache;
struct cache_detail *idtoname_cache; struct cache_detail *idtoname_cache;
struct cache_detail *nametoid_cache;
}; };
extern int nfsd_net_id; extern int nfsd_net_id;

24
fs/nfsd/nfs4idmap.c
View File

@ -301,8 +301,6 @@ idtoname_update(struct cache_detail *cd, struct ent *new, struct ent *old)
* Name -> ID cache * Name -> ID cache
*/ */
static struct cache_head *nametoid_table[ENT_HASHMAX];
static inline int static inline int
nametoid_hash(struct ent *ent) nametoid_hash(struct ent *ent)
{ {
@ -362,10 +360,9 @@ static struct ent *nametoid_update(struct cache_detail *, struct ent *,
struct ent *); struct ent *);
static int nametoid_parse(struct cache_detail *, char *, int); static int nametoid_parse(struct cache_detail *, char *, int);
static struct cache_detail nametoid_cache = { static struct cache_detail nametoid_cache_template = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hash_size = ENT_HASHMAX, .hash_size = ENT_HASHMAX,
.hash_table = nametoid_table,
.name = "nfs4.nametoid", .name = "nfs4.nametoid",
.cache_put = ent_put, .cache_put = ent_put,
.cache_upcall = nametoid_upcall, .cache_upcall = nametoid_upcall,
@ -479,11 +476,18 @@ nfsd_idmap_init(struct net *net)
rv = cache_register_net(nn->idtoname_cache, net); rv = cache_register_net(nn->idtoname_cache, net);
if (rv) if (rv)
goto destroy_idtoname_cache; goto destroy_idtoname_cache;
rv = cache_register_net(&nametoid_cache, net); nn->nametoid_cache = cache_create_net(&nametoid_cache_template, net);
if (rv) if (IS_ERR(nn->nametoid_cache)) {
rv = PTR_ERR(nn->idtoname_cache);
goto unregister_idtoname_cache; goto unregister_idtoname_cache;
}
rv = cache_register_net(nn->nametoid_cache, net);
if (rv)
goto destroy_nametoid_cache;
return 0; return 0;
destroy_nametoid_cache:
cache_destroy_net(nn->nametoid_cache, net);
unregister_idtoname_cache: unregister_idtoname_cache:
cache_unregister_net(nn->idtoname_cache, net); cache_unregister_net(nn->idtoname_cache, net);
destroy_idtoname_cache: destroy_idtoname_cache:
@ -497,8 +501,9 @@ nfsd_idmap_shutdown(struct net *net)
struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct nfsd_net *nn = net_generic(net, nfsd_net_id);
cache_unregister_net(nn->idtoname_cache, net); cache_unregister_net(nn->idtoname_cache, net);
cache_unregister_net(&nametoid_cache, net); cache_unregister_net(nn->nametoid_cache, net);
cache_destroy_net(nn->idtoname_cache, net); cache_destroy_net(nn->idtoname_cache, net);
cache_destroy_net(nn->nametoid_cache, net);
} }
static int static int
@ -541,19 +546,20 @@ idmap_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen
.type = type, .type = type,
}; };
int ret; int ret;
struct nfsd_net *nn = net_generic(rqstp->rq_xprt->xpt_net, nfsd_net_id);
if (namelen + 1 > sizeof(key.name)) if (namelen + 1 > sizeof(key.name))
return nfserr_badowner; return nfserr_badowner;
memcpy(key.name, name, namelen); memcpy(key.name, name, namelen);
key.name[namelen] = '\0'; key.name[namelen] = '\0';
strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname)); strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
ret = idmap_lookup(rqstp, nametoid_lookup, &key, &nametoid_cache, &item); ret = idmap_lookup(rqstp, nametoid_lookup, &key, nn->nametoid_cache, &item);
if (ret == -ENOENT) if (ret == -ENOENT)
return nfserr_badowner; return nfserr_badowner;
if (ret) if (ret)
return nfserrno(ret); return nfserrno(ret);
*id = item->id; *id = item->id;
cache_put(&item->h, &nametoid_cache); cache_put(&item->h, nn->nametoid_cache);
return 0; return 0;
} }