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"

+1 -9
+1 -9
fs/nfsd/export.c
··· 1316 1316 1317 1317 static struct svc_export *find_fsidzero_export(struct svc_rqst *rqstp) 1318 1318 { 1319 - struct svc_export *exp; 1320 1319 u32 fsidv[2]; 1321 1320 1322 1321 mk_fsid(FSID_NUM, fsidv, 0, 0, 0, NULL); 1323 1322 1324 - exp = rqst_exp_find(rqstp, FSID_NUM, fsidv); 1325 - /* 1326 - * We shouldn't have accepting an nfsv4 request at all if we 1327 - * don't have a pseudoexport!: 1328 - */ 1329 - if (IS_ERR(exp) && PTR_ERR(exp) == -ENOENT) 1330 - exp = ERR_PTR(-ESERVERFAULT); 1331 - return exp; 1323 + return rqst_exp_find(rqstp, FSID_NUM, fsidv); 1332 1324 } 1333 1325 1334 1326 /*