Skip to content

L
linux-davinci-2.6.23
Commit f9ecc921 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files
Options

[PATCH] knfsd: Use new cache code for name/id lookup caches 

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 17f834b6
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 23 deletions
fs/nfsd/nfs4idmap.c
View file @ f9ecc921
...@@ -82,9 +82,12 @@ struct ent { ...@@ -82,9 +82,12 @@ struct ent {
#define ENT_HASHMAX (1 << ENT_HASHBITS) #define ENT_HASHMAX (1 << ENT_HASHBITS)
#define ENT_HASHMASK (ENT_HASHMAX - 1) #define ENT_HASHMASK (ENT_HASHMAX - 1)
static inline void static void
ent_init(struct ent *new, struct ent *itm) ent_init(struct cache_head *cnew, struct cache_head *citm)
{ {
struct ent *new = container_of(cnew, struct ent, h);
struct ent *itm = container_of(citm, struct ent, h);
new->id = itm->id; new->id = itm->id;
new->type = itm->type; new->type = itm->type;
...@@ -92,12 +95,6 @@ ent_init(struct ent *new, struct ent *itm) ...@@ -92,12 +95,6 @@ ent_init(struct ent *new, struct ent *itm)
strlcpy(new->authname, itm->authname, sizeof(new->name)); strlcpy(new->authname, itm->authname, sizeof(new->name));
} }
static inline void
ent_update(struct ent *new, struct ent *itm)
{
ent_init(new, itm);
}
static void static void
ent_put(struct cache_head *ch, struct cache_detail *cd) ent_put(struct cache_head *ch, struct cache_detail *cd)
{ {
...@@ -107,6 +104,16 @@ ent_put(struct cache_head *ch, struct cache_detail *cd) ...@@ -107,6 +104,16 @@ ent_put(struct cache_head *ch, struct cache_detail *cd)
} }
} }
static struct cache_head *
ent_alloc(void)
{
struct ent *e = kmalloc(sizeof(*e), GFP_KERNEL);
if (e)
return &e->h;
else
return NULL;
}
/* /*
* ID -> Name cache * ID -> Name cache
*/ */
...@@ -143,9 +150,12 @@ idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp, ...@@ -143,9 +150,12 @@ idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
(*bpp)[-1] = '\n'; (*bpp)[-1] = '\n';
} }
static inline int static int
idtoname_match(struct ent *a, struct ent *b) idtoname_match(struct cache_head *ca, struct cache_head *cb)
{ {
struct ent *a = container_of(ca, struct ent, h);
struct ent *b = container_of(cb, struct ent, h);
return (a->id == b->id && a->type == b->type && return (a->id == b->id && a->type == b->type &&
strcmp(a->authname, b->authname) == 0); strcmp(a->authname, b->authname) == 0);
} }
...@@ -178,7 +188,8 @@ warn_no_idmapd(struct cache_detail *detail) ...@@ -178,7 +188,8 @@ warn_no_idmapd(struct cache_detail *detail)
static int idtoname_parse(struct cache_detail *, char *, int); static int idtoname_parse(struct cache_detail *, char *, int);
static struct ent *idtoname_lookup(struct ent *, int); static struct ent *idtoname_lookup(struct ent *);
static struct ent *idtoname_update(struct ent *, struct ent *);
static struct cache_detail idtoname_cache = { static struct cache_detail idtoname_cache = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -190,6 +201,10 @@ static struct cache_detail idtoname_cache = { ...@@ -190,6 +201,10 @@ static struct cache_detail idtoname_cache = {
.cache_parse = idtoname_parse, .cache_parse = idtoname_parse,
.cache_show = idtoname_show, .cache_show = idtoname_show,
.warn_no_listener = warn_no_idmapd, .warn_no_listener = warn_no_idmapd,
.match = idtoname_match,
.init = ent_init,
.update = ent_init,
.alloc = ent_alloc,
}; };
int int
...@@ -232,6 +247,11 @@ idtoname_parse(struct cache_detail *cd, char *buf, int buflen) ...@@ -232,6 +247,11 @@ idtoname_parse(struct cache_detail *cd, char *buf, int buflen)
if (ent.h.expiry_time == 0) if (ent.h.expiry_time == 0)
goto out; goto out;
error = -ENOMEM;
res = idtoname_lookup(&ent);
if (!res)
goto out;
/* Name */ /* Name */
error = qword_get(&buf, buf1, PAGE_SIZE); error = qword_get(&buf, buf1, PAGE_SIZE);
if (error == -EINVAL) if (error == -EINVAL)
...@@ -246,7 +266,8 @@ idtoname_parse(struct cache_detail *cd, char *buf, int buflen) ...@@ -246,7 +266,8 @@ idtoname_parse(struct cache_detail *cd, char *buf, int buflen)
memcpy(ent.name, buf1, sizeof(ent.name)); memcpy(ent.name, buf1, sizeof(ent.name));
} }
error = -ENOMEM; error = -ENOMEM;
if ((res = idtoname_lookup(&ent, 1)) == NULL) res = idtoname_update(&ent, res);
if (res == NULL)
goto out; goto out;
ent_put(&res->h, &idtoname_cache); ent_put(&res->h, &idtoname_cache);
...@@ -258,7 +279,31 @@ out: ...@@ -258,7 +279,31 @@ out:
return error; return error;
} }
static DefineSimpleCacheLookup(ent, idtoname);
static struct ent *
idtoname_lookup(struct ent *item)
{
struct cache_head *ch = sunrpc_cache_lookup(&idtoname_cache,
&item->h,
idtoname_hash(item));
if (ch)
return container_of(ch, struct ent, h);
else
return NULL;
}
static struct ent *
idtoname_update(struct ent *new, struct ent *old)
{
struct cache_head *ch = sunrpc_cache_update(&idtoname_cache,
&new->h, &old->h,
idtoname_hash(new));
if (ch)
return container_of(ch, struct ent, h);
else
return NULL;
}
/* /*
* Name -> ID cache * Name -> ID cache
...@@ -285,9 +330,12 @@ nametoid_request(struct cache_detail *cd, struct cache_head *ch, char **bpp, ...@@ -285,9 +330,12 @@ nametoid_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
(*bpp)[-1] = '\n'; (*bpp)[-1] = '\n';
} }
static inline int static int
nametoid_match(struct ent *a, struct ent *b) nametoid_match(struct cache_head *ca, struct cache_head *cb)
{ {
struct ent *a = container_of(ca, struct ent, h);
struct ent *b = container_of(cb, struct ent, h);
return (a->type == b->type && strcmp(a->name, b->name) == 0 && return (a->type == b->type && strcmp(a->name, b->name) == 0 &&
strcmp(a->authname, b->authname) == 0); strcmp(a->authname, b->authname) == 0);
} }
...@@ -311,7 +359,8 @@ nametoid_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h) ...@@ -311,7 +359,8 @@ nametoid_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
return 0; return 0;
} }
static struct ent *nametoid_lookup(struct ent *, int); static struct ent *nametoid_lookup(struct ent *);
static struct ent *nametoid_update(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 = {
...@@ -324,6 +373,10 @@ static struct cache_detail nametoid_cache = { ...@@ -324,6 +373,10 @@ static struct cache_detail nametoid_cache = {
.cache_parse = nametoid_parse, .cache_parse = nametoid_parse,
.cache_show = nametoid_show, .cache_show = nametoid_show,
.warn_no_listener = warn_no_idmapd, .warn_no_listener = warn_no_idmapd,
.match = nametoid_match,
.init = ent_init,
.update = ent_init,
.alloc = ent_alloc,
}; };
static int static int
...@@ -373,7 +426,11 @@ nametoid_parse(struct cache_detail *cd, char *buf, int buflen) ...@@ -373,7 +426,11 @@ nametoid_parse(struct cache_detail *cd, char *buf, int buflen)
set_bit(CACHE_NEGATIVE, &ent.h.flags); set_bit(CACHE_NEGATIVE, &ent.h.flags);
error = -ENOMEM; error = -ENOMEM;
if ((res = nametoid_lookup(&ent, 1)) == NULL) res = nametoid_lookup(&ent);
if (res == NULL)
goto out;
res = nametoid_update(&ent, res);
if (res == NULL)
goto out; goto out;
ent_put(&res->h, &nametoid_cache); ent_put(&res->h, &nametoid_cache);
...@@ -384,7 +441,30 @@ out: ...@@ -384,7 +441,30 @@ out:
return (error); return (error);
} }
static DefineSimpleCacheLookup(ent, nametoid);
static struct ent *
nametoid_lookup(struct ent *item)
{
struct cache_head *ch = sunrpc_cache_lookup(&nametoid_cache,
&item->h,
nametoid_hash(item));
if (ch)
return container_of(ch, struct ent, h);
else
return NULL;
}
static struct ent *
nametoid_update(struct ent *new, struct ent *old)
{
struct cache_head *ch = sunrpc_cache_update(&nametoid_cache,
&new->h, &old->h,
nametoid_hash(new));
if (ch)
return container_of(ch, struct ent, h);
else
return NULL;
}
/* /*
* Exported API * Exported API
...@@ -452,24 +532,24 @@ idmap_defer(struct cache_req *req) ...@@ -452,24 +532,24 @@ idmap_defer(struct cache_req *req)
} }
static inline int static inline int
do_idmap_lookup(struct ent *(*lookup_fn)(struct ent *, int), struct ent *key, do_idmap_lookup(struct ent *(*lookup_fn)(struct ent *), struct ent *key,
struct cache_detail *detail, struct ent **item, struct cache_detail *detail, struct ent **item,
struct idmap_defer_req *mdr) struct idmap_defer_req *mdr)
{ {
*item = lookup_fn(key, 0); *item = lookup_fn(key);
if (!*item) if (!*item)
return -ENOMEM; return -ENOMEM;
return cache_check(detail, &(*item)->h, &mdr->req); return cache_check(detail, &(*item)->h, &mdr->req);
} }
static inline int static inline int
do_idmap_lookup_nowait(struct ent *(*lookup_fn)(struct ent *, int), do_idmap_lookup_nowait(struct ent *(*lookup_fn)(struct ent *),
struct ent *key, struct cache_detail *detail, struct ent *key, struct cache_detail *detail,
struct ent **item) struct ent **item)
{ {
int ret = -ENOMEM; int ret = -ENOMEM;
*item = lookup_fn(key, 0); *item = lookup_fn(key);
if (!*item) if (!*item)
goto out_err; goto out_err;
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
...@@ -490,7 +570,7 @@ out_err: ...@@ -490,7 +570,7 @@ out_err:
static int static int
idmap_lookup(struct svc_rqst *rqstp, idmap_lookup(struct svc_rqst *rqstp,
struct ent *(*lookup_fn)(struct ent *, int), struct ent *key, struct ent *(*lookup_fn)(struct ent *), struct ent *key,
struct cache_detail *detail, struct ent **item) struct cache_detail *detail, struct ent **item)
{ {
struct idmap_defer_req *mdr; struct idmap_defer_req *mdr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment