diff --git a/[refs] b/[refs] index a046cc0f197d..59e70d95d277 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b41bd85d5f93af37c2730df172aeb54280be7c3 +refs/heads/master: 6899320c2cefe5ae6b606f820ba8b762ba21f34a diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c index 0747bb5ffcf1..b0591cd172eb 100644 --- a/trunk/fs/nfsd/export.c +++ b/trunk/fs/nfsd/export.c @@ -1163,12 +1163,10 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp, mk_fsid_v1(fsidv, 0); exp = exp_find(clp, 1, fsidv, creq); - if (IS_ERR(exp) && PTR_ERR(exp) == -EAGAIN) - return nfserr_dropit; + if (IS_ERR(exp)) + return nfserrno(PTR_ERR(exp)); if (exp == NULL) return nfserr_perm; - else if (IS_ERR(exp)) - return nfserrno(PTR_ERR(exp)); rv = fh_compose(fhp, exp, exp->ex_dentry, NULL); exp_put(exp); return rv;