Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 24267
b: refs/heads/master
c: 4f7774c
h: refs/heads/master
i:
  24265: 4d7f794
  24263: ba5fcf7
v: v3
  • Loading branch information
NeilBrown authored and Linus Torvalds committed Mar 27, 2006
1 parent b83c552 commit d25712d
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a9917c2da5b81fa536e560be0c431435e2c965b
refs/heads/master: 4f7774c3a0558526c0faaf525581f2029480b313
125 changes: 88 additions & 37 deletions trunk/fs/nfsd/export.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 *
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit d25712d

Please sign in to comment.