* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
char authname[IDMAP_NAMESZ];
};
+#define DefineSimpleCacheLookupMap(STRUCT, FUNC) \
+ DefineCacheLookup(struct STRUCT, h, FUNC##_lookup, \
+ (struct STRUCT *item, int set), /*no setup */, \
+ & FUNC##_cache, FUNC##_hash(item), FUNC##_match(item, tmp), \
+ STRUCT##_init(new, item), STRUCT##_update(tmp, item), 0)
+
/* Common entry handling */
#define ENT_HASHBITS 8
#define ENT_HASHMAX (1 << ENT_HASHBITS)
#define ENT_HASHMASK (ENT_HASHMAX - 1)
-static void
-ent_init(struct cache_head *cnew, struct cache_head *citm)
+static inline void
+ent_init(struct ent *new, struct ent *itm)
{
- struct ent *new = container_of(cnew, struct ent, h);
- struct ent *itm = container_of(citm, struct ent, h);
-
new->id = itm->id;
new->type = itm->type;
strlcpy(new->authname, itm->authname, sizeof(new->name));
}
-static void
-ent_put(struct kref *ref)
+static inline void
+ent_update(struct ent *new, struct ent *itm)
{
- struct ent *map = container_of(ref, struct ent, h.ref);
- kfree(map);
+ ent_init(new, itm);
}
-static struct cache_head *
-ent_alloc(void)
+static void
+ent_put(struct cache_head *ch, struct cache_detail *cd)
{
- struct ent *e = kmalloc(sizeof(*e), GFP_KERNEL);
- if (e)
- return &e->h;
- else
- return NULL;
+ if (cache_put(ch, cd)) {
+ struct ent *map = container_of(ch, struct ent, h);
+ kfree(map);
+ }
}
/*
(*bpp)[-1] = '\n';
}
-static int
-idtoname_match(struct cache_head *ca, struct cache_head *cb)
+static inline int
+idtoname_match(struct ent *a, struct ent *b)
{
- 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 &&
strcmp(a->authname, b->authname) == 0);
}
static int idtoname_parse(struct cache_detail *, char *, int);
-static struct ent *idtoname_lookup(struct ent *);
-static struct ent *idtoname_update(struct ent *, struct ent *);
+static struct ent *idtoname_lookup(struct ent *, int);
static struct cache_detail idtoname_cache = {
.owner = THIS_MODULE,
.cache_parse = idtoname_parse,
.cache_show = idtoname_show,
.warn_no_listener = warn_no_idmapd,
- .match = idtoname_match,
- .init = ent_init,
- .update = ent_init,
- .alloc = ent_alloc,
};
int
if (ent.h.expiry_time == 0)
goto out;
- error = -ENOMEM;
- res = idtoname_lookup(&ent);
- if (!res)
- goto out;
-
/* Name */
error = qword_get(&buf, buf1, PAGE_SIZE);
if (error == -EINVAL)
memcpy(ent.name, buf1, sizeof(ent.name));
}
error = -ENOMEM;
- res = idtoname_update(&ent, res);
- if (res == NULL)
+ if ((res = idtoname_lookup(&ent, 1)) == NULL)
goto out;
- cache_put(&res->h, &idtoname_cache);
+ ent_put(&res->h, &idtoname_cache);
error = 0;
out:
return error;
}
-
-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;
-}
-
+static DefineSimpleCacheLookupMap(ent, idtoname);
/*
* Name -> ID cache
(*bpp)[-1] = '\n';
}
-static int
-nametoid_match(struct cache_head *ca, struct cache_head *cb)
+static inline int
+nametoid_match(struct ent *a, struct ent *b)
{
- 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 &&
strcmp(a->authname, b->authname) == 0);
}
return 0;
}
-static struct ent *nametoid_lookup(struct ent *);
-static struct ent *nametoid_update(struct ent *, struct ent *);
+static struct ent *nametoid_lookup(struct ent *, int);
static int nametoid_parse(struct cache_detail *, char *, int);
static struct cache_detail nametoid_cache = {
.cache_parse = nametoid_parse,
.cache_show = nametoid_show,
.warn_no_listener = warn_no_idmapd,
- .match = nametoid_match,
- .init = ent_init,
- .update = ent_init,
- .alloc = ent_alloc,
};
static int
set_bit(CACHE_NEGATIVE, &ent.h.flags);
error = -ENOMEM;
- res = nametoid_lookup(&ent);
- if (res == NULL)
- goto out;
- res = nametoid_update(&ent, res);
- if (res == NULL)
+ if ((res = nametoid_lookup(&ent, 1)) == NULL)
goto out;
- cache_put(&res->h, &nametoid_cache);
+ ent_put(&res->h, &nametoid_cache);
error = 0;
out:
kfree(buf1);
return (error);
}
-
-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;
-}
+static DefineSimpleCacheLookupMap(ent, nametoid);
/*
* Exported API
}
static inline int
-do_idmap_lookup(struct ent *(*lookup_fn)(struct ent *), struct ent *key,
+do_idmap_lookup(struct ent *(*lookup_fn)(struct ent *, int), struct ent *key,
struct cache_detail *detail, struct ent **item,
struct idmap_defer_req *mdr)
{
- *item = lookup_fn(key);
+ *item = lookup_fn(key, 0);
if (!*item)
return -ENOMEM;
return cache_check(detail, &(*item)->h, &mdr->req);
}
static inline int
-do_idmap_lookup_nowait(struct ent *(*lookup_fn)(struct ent *),
+do_idmap_lookup_nowait(struct ent *(*lookup_fn)(struct ent *, int),
struct ent *key, struct cache_detail *detail,
struct ent **item)
{
int ret = -ENOMEM;
- *item = lookup_fn(key);
+ *item = lookup_fn(key, 0);
if (!*item)
goto out_err;
ret = -ETIMEDOUT;
goto out_put;
return 0;
out_put:
- cache_put(&(*item)->h, detail);
+ ent_put(&(*item)->h, detail);
out_err:
*item = NULL;
return ret;
static int
idmap_lookup(struct svc_rqst *rqstp,
- struct ent *(*lookup_fn)(struct ent *), struct ent *key,
+ struct ent *(*lookup_fn)(struct ent *, int), struct ent *key,
struct cache_detail *detail, struct ent **item)
{
struct idmap_defer_req *mdr;
if (ret)
return ret;
*id = item->id;
- cache_put(&item->h, &nametoid_cache);
+ ent_put(&item->h, &nametoid_cache);
return 0;
}
ret = strlen(item->name);
BUG_ON(ret > IDMAP_NAMESZ);
memcpy(name, item->name, ret);
- cache_put(&item->h, &idtoname_cache);
+ ent_put(&item->h, &idtoname_cache);
return ret;
}
git://git.onelab.eu / linux-2.6.git / blobdiff