From e86b8c5bbcadc29b581449b11a7f65e4b22be32c Mon Sep 17 00:00:00 2001 From: "J.Bruce Fields" Date: Wed, 4 Oct 2006 02:16:09 -0700 Subject: [PATCH] --- yaml --- r: 38393 b: refs/heads/master c: f38b20c64519bb812a49b9ef4e10d90367a5af5c h: refs/heads/master i: 38391: 45ae195bab47a25b02c7d8a23e81767b46cc73ce v: v3 --- [refs] | 2 +- trunk/fs/nfsd/export.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index fdfb9c068bc2..d2094eb5f277 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f8e05c5708d7e9017c47f395f8b1498f7f52922 +refs/heads/master: f38b20c64519bb812a49b9ef4e10d90367a5af5c diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c index cfe141e5d759..ac5149d25372 100644 --- a/trunk/fs/nfsd/export.c +++ b/trunk/fs/nfsd/export.c @@ -1048,30 +1048,24 @@ int exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, struct cache_req *creq) { - struct svc_expkey *fsid_key; struct svc_export *exp; int rv; u32 fsidv[2]; mk_fsid_v1(fsidv, 0); - fsid_key = exp_find_key(clp, 1, fsidv, creq); - if (IS_ERR(fsid_key) && PTR_ERR(fsid_key) == -EAGAIN) + exp = exp_find(clp, 1, fsidv, creq); + if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN) return nfserr_dropit; - if (!fsid_key || IS_ERR(fsid_key)) - return nfserr_perm; - - exp = exp_get_by_name(clp, fsid_key->ek_mnt, fsid_key->ek_dentry, creq); if (exp == NULL) rv = nfserr_perm; else if (IS_ERR(exp)) rv = nfserrno(PTR_ERR(exp)); else { rv = fh_compose(fhp, exp, - fsid_key->ek_dentry, NULL); + exp->ex_dentry, NULL); exp_put(exp); } - cache_put(&fsid_key->h, &svc_expkey_cache); return rv; }