[PATCH] knfsd: Use new cache_lookup for svc_export

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index c591761..2ebd77d 100644 (file)
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -258,16 +258,6 @@ static DefineSimpleCacheLookup(svc_expkey, svc_expkey)
 
 static struct cache_head *export_table[EXPORT_HASHMAX];
 
-static inline int svc_export_hash(struct svc_export *item)
-{
-       int rv;
-
-       rv = hash_ptr(item->ex_client, EXPORT_HASHBITS);
-       rv ^= hash_ptr(item->ex_dentry, EXPORT_HASHBITS);
-       rv ^= hash_ptr(item->ex_mnt, EXPORT_HASHBITS);
-       return rv;
-}
-
 void svc_export_put(struct cache_head *item, struct cache_detail *cd)
 {
        if (cache_put(item, cd)) {
@@ -298,7 +288,8 @@ static void svc_export_request(struct cache_detail *cd,
        (*bpp)[-1] = '\n';
 }
 
-static struct svc_export *svc_export_lookup(struct svc_export *, int);
+struct svc_export *svc_export_update(struct svc_export *new, struct svc_export *old);
+static struct svc_export *svc_export_lookup(struct svc_export *);
 
 static int check_export(struct inode *inode, int flags)
 {
@@ -411,11 +402,16 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
                if (err) goto out;
        }
 
-       expp = svc_export_lookup(&exp, 1);
+       expp = svc_export_lookup(&exp);
        if (expp)
-               exp_put(expp);
-       err = 0;
+               expp = svc_export_update(&exp, expp);
+       else
+               err = -ENOMEM;
        cache_flush();
+       if (expp == NULL)
+               err = -ENOMEM;
+       else
+               exp_put(expp);
  out:
        if (nd.dentry)
                path_release(&nd);
@@ -449,40 +445,95 @@ static int svc_export_show(struct seq_file *m,
        seq_puts(m, ")\n");
        return 0;
 }
-struct cache_detail svc_export_cache = {
-       .owner          = THIS_MODULE,
-       .hash_size      = EXPORT_HASHMAX,
-       .hash_table     = export_table,
-       .name           = "nfsd.export",
-       .cache_put      = svc_export_put,
-       .cache_request  = svc_export_request,
-       .cache_parse    = svc_export_parse,
-       .cache_show     = svc_export_show,
-};
-
-static inline int svc_export_match(struct svc_export *a, struct svc_export *b)
+static int svc_export_match(struct cache_head *a, struct cache_head *b)
 {
-       return a->ex_client == b->ex_client &&
-               a->ex_dentry == b->ex_dentry &&
-               a->ex_mnt == b->ex_mnt;
+       struct svc_export *orig = container_of(a, struct svc_export, h);
+       struct svc_export *new = container_of(b, struct svc_export, h);
+       return orig->ex_client == new->ex_client &&
+               orig->ex_dentry == new->ex_dentry &&
+               orig->ex_mnt == new->ex_mnt;
 }
-static inline void svc_export_init(struct svc_export *new, struct svc_export *item)
+
+static void svc_export_init(struct cache_head *cnew, struct cache_head *citem)
 {
+       struct svc_export *new = container_of(cnew, struct svc_export, h);
+       struct svc_export *item = container_of(citem, struct svc_export, h);
+
        kref_get(&item->ex_client->ref);
        new->ex_client = item->ex_client;
        new->ex_dentry = dget(item->ex_dentry);
        new->ex_mnt = mntget(item->ex_mnt);
 }
 
-static inline void svc_export_update(struct svc_export *new, struct svc_export *item)
+static void export_update(struct cache_head *cnew, struct cache_head *citem)
 {
+       struct svc_export *new = container_of(cnew, struct svc_export, h);
+       struct svc_export *item = container_of(citem, struct svc_export, h);
+
        new->ex_flags = item->ex_flags;
        new->ex_anon_uid = item->ex_anon_uid;
        new->ex_anon_gid = item->ex_anon_gid;
        new->ex_fsid = item->ex_fsid;
 }
 
-static DefineSimpleCacheLookup(svc_export, svc_export)
+static struct cache_head *svc_export_alloc(void)
+{
+       struct svc_export *i = kmalloc(sizeof(*i), GFP_KERNEL);
+       if (i)
+               return &i->h;
+       else
+               return NULL;
+}
+
+struct cache_detail svc_export_cache = {
+       .owner          = THIS_MODULE,
+       .hash_size      = EXPORT_HASHMAX,
+       .hash_table     = export_table,
+       .name           = "nfsd.export",
+       .cache_put      = svc_export_put,
+       .cache_request  = svc_export_request,
+       .cache_parse    = svc_export_parse,
+       .cache_show     = svc_export_show,
+       .match          = svc_export_match,
+       .init           = svc_export_init,
+       .update         = export_update,
+       .alloc          = svc_export_alloc,
+};
+
+static struct svc_export *
+svc_export_lookup(struct svc_export *exp)
+{
+       struct cache_head *ch;
+       int hash;
+       hash = hash_ptr(exp->ex_client, EXPORT_HASHBITS);
+       hash ^= hash_ptr(exp->ex_dentry, EXPORT_HASHBITS);
+       hash ^= hash_ptr(exp->ex_mnt, EXPORT_HASHBITS);
+
+       ch = sunrpc_cache_lookup(&svc_export_cache, &exp->h,
+                                hash);
+       if (ch)
+               return container_of(ch, struct svc_export, h);
+       else
+               return NULL;
+}
+
+struct svc_export *
+svc_export_update(struct svc_export *new, struct svc_export *old)
+{
+       struct cache_head *ch;
+       int hash;
+       hash = hash_ptr(old->ex_client, EXPORT_HASHBITS);
+       hash ^= hash_ptr(old->ex_dentry, EXPORT_HASHBITS);
+       hash ^= hash_ptr(old->ex_mnt, EXPORT_HASHBITS);
+
+       ch = sunrpc_cache_update(&svc_export_cache, &new->h,
+                                &old->h,
+                                hash);
+       if (ch)
+               return container_of(ch, struct svc_export, h);
+       else
+               return NULL;
+}
 
 
 struct svc_expkey *
@@ -568,7 +619,7 @@ exp_get_by_name(svc_client *clp, struct vfsmount *mnt, struct dentry *dentry,
        key.ex_mnt = mnt;
        key.ex_dentry = dentry;
 
-       exp = svc_export_lookup(&key, 0);
+       exp = svc_export_lookup(&key);
        if (exp != NULL) 
                switch (cache_check(&svc_export_cache, &exp->h, reqp)) {
                case 0: break;
@@ -770,13 +821,13 @@ exp_export(struct nfsctl_export *nxp)
        new.ex_anon_gid = nxp->ex_anon_gid;
        new.ex_fsid = nxp->ex_dev;
 
-       exp = svc_export_lookup(&new, 1);
+       exp = svc_export_lookup(&new);
+       if (exp)
+               exp = svc_export_update(&new, exp);
 
-       if (exp == NULL)
+       if (!exp)
                goto finish;
 
-       err = 0;
-
        if (exp_hash(clp, exp) ||
            exp_fsid_hash(clp, exp)) {
                /* failed to create at least one index */