diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-08 17:08:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-08 17:08:01 -0800 |
| commit | deb0c98c7f6035d47a247e548384517a955314a5 (patch) | |
| tree | 26428b06c7c0c7db106d731c61c1dee2069c3a39 | |
| parent | a5f28ae4df291d81d9d23066f88c55ca45e388d3 (diff) | |
| parent | 260c64d23532caf19abb77e696971da05c388489 (diff) | |
Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.33' of git://linux-nfs.org/~bfields/linux:
Revert "nfsd4: fix error return when pseudoroot missing"
| -rw-r--r-- | fs/nfsd/export.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index c487810a236..a0c4016413f 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -1316,19 +1316,11 @@ rqst_exp_parent(struct svc_rqst *rqstp, struct path *path) static struct svc_export *find_fsidzero_export(struct svc_rqst *rqstp) { - struct svc_export *exp; u32 fsidv[2]; mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL); - exp = rqst_exp_find(rqstp, FSID_NUM, fsidv); - /* - * We shouldn't have accepting an nfsv4 request at all if we - * don't have a pseudoexport!: - */ - if (IS_ERR(exp) && PTR_ERR(exp) == -ENOENT) - exp = ERR_PTR(-ESERVERFAULT); - return exp; + return rqst_exp_find(rqstp, FSID_NUM, fsidv); } /* |