UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd: add link to owner cache detail to svc_export structure 

Without info about owner cache datail it won't be able to find out, which
per-net cache detail have to be.

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-03-28 19:09:08 +04:00 committed by J. Bruce Fields
parent d4bb527e9e
commit db3a353263
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfsd/export.c
View File

@ -525,6 +525,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
goto out1; goto out1;
exp.ex_client = dom; exp.ex_client = dom;
exp.cd = cd;
/* expiry */ /* expiry */
err = -EINVAL; err = -EINVAL;
@ -672,6 +673,7 @@ static void svc_export_init(struct cache_head *cnew, struct cache_head *citem)
new->ex_fslocs.locations = NULL; new->ex_fslocs.locations = NULL;
new->ex_fslocs.locations_count = 0; new->ex_fslocs.locations_count = 0;
new->ex_fslocs.migrated = 0; new->ex_fslocs.migrated = 0;
new->cd = item->cd;
} }
static void export_update(struct cache_head *cnew, struct cache_head *citem) static void export_update(struct cache_head *cnew, struct cache_head *citem)
@ -739,8 +741,7 @@ svc_export_lookup(struct svc_export *exp)
struct cache_head *ch; struct cache_head *ch;
int hash = svc_export_hash(exp); int hash = svc_export_hash(exp);
ch = sunrpc_cache_lookup(&svc_export_cache, &exp->h, ch = sunrpc_cache_lookup(exp->cd, &exp->h, hash);
hash);
if (ch) if (ch)
return container_of(ch, struct svc_export, h); return container_of(ch, struct svc_export, h);
else else
@ -753,9 +754,7 @@ svc_export_update(struct svc_export *new, struct svc_export *old)
struct cache_head *ch; struct cache_head *ch;
int hash = svc_export_hash(old); int hash = svc_export_hash(old);
ch = sunrpc_cache_update(&svc_export_cache, &new->h, ch = sunrpc_cache_update(old->cd, &new->h, &old->h, hash);
&old->h,
hash);
if (ch) if (ch)
return container_of(ch, struct svc_export, h); return container_of(ch, struct svc_export, h);
else else
@ -797,6 +796,7 @@ static svc_export *exp_get_by_name(svc_client *clp, const struct path *path,
key.ex_client = clp; key.ex_client = clp;
key.ex_path = *path; key.ex_path = *path;
key.cd = &svc_export_cache;
exp = svc_export_lookup(&key); exp = svc_export_lookup(&key);
if (exp == NULL) if (exp == NULL)

1
include/linux/nfsd/export.h
View File

@ -103,6 +103,7 @@ struct svc_export {
struct nfsd4_fs_locations ex_fslocs; struct nfsd4_fs_locations ex_fslocs;
int ex_nflavors; int ex_nflavors;
struct exp_flavor_info ex_flavors[MAX_SECINFO_LIST]; struct exp_flavor_info ex_flavors[MAX_SECINFO_LIST];
struct cache_detail *cd;
}; };
/* an "export key" (expkey) maps a filehandlefragement to an /* an "export key" (expkey) maps a filehandlefragement to an