aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2006-03-27 04:14:59 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 11:44:41 -0500
commitefc36aa5608f5717338747e152c23f2cfdb14697 (patch)
treeab444f6e6c88ed07a8d5a034777c10de50e663fd /fs/nfsd
parent3e7b19198003fc25b11838e709f17d4fa173b2d7 (diff)
[PATCH] knfsd: Change the store of auth_domains to not be a 'cache'
The 'auth_domain's are simply handles on internal data structures. They do not cache information from user-space, and forcing them into the mold of a 'cache' misrepresents their true nature and causes confusion. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/export.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 417ec02df44f..ac0997731fce 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -242,7 +242,7 @@ static inline int svc_expkey_match (struct svc_expkey *a, struct svc_expkey *b)
242 242
243static inline void svc_expkey_init(struct svc_expkey *new, struct svc_expkey *item) 243static inline void svc_expkey_init(struct svc_expkey *new, struct svc_expkey *item)
244{ 244{
245 cache_get(&item->ek_client->h); 245 kref_get(&item->ek_client->ref);
246 new->ek_client = item->ek_client; 246 new->ek_client = item->ek_client;
247 new->ek_fsidtype = item->ek_fsidtype; 247 new->ek_fsidtype = item->ek_fsidtype;
248 new->ek_fsid[0] = item->ek_fsid[0]; 248 new->ek_fsid[0] = item->ek_fsid[0];
@@ -474,7 +474,7 @@ static inline int svc_export_match(struct svc_export *a, struct svc_export *b)
474} 474}
475static inline void svc_export_init(struct svc_export *new, struct svc_export *item) 475static inline void svc_export_init(struct svc_export *new, struct svc_export *item)
476{ 476{
477 cache_get(&item->ex_client->h); 477 kref_get(&item->ex_client->ref);
478 new->ex_client = item->ex_client; 478 new->ex_client = item->ex_client;
479 new->ex_dentry = dget(item->ex_dentry); 479 new->ex_dentry = dget(item->ex_dentry);
480 new->ex_mnt = mntget(item->ex_mnt); 480 new->ex_mnt = mntget(item->ex_mnt);
@@ -1129,7 +1129,6 @@ exp_delclient(struct nfsctl_client *ncp)
1129 */ 1129 */
1130 if (dom) { 1130 if (dom) {
1131 err = auth_unix_forget_old(dom); 1131 err = auth_unix_forget_old(dom);
1132 dom->h.expiry_time = get_seconds();
1133 auth_domain_put(dom); 1132 auth_domain_put(dom);
1134 } 1133 }
1135 1134