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"
This commit is contained in:
commit
deb0c98c7f
1 changed files with 1 additions and 9 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Reference in a new issue