NFSD: Map nfserr_wrongsec outside of nfsd_dispatch

Refactor: Handle this NFS version-specific mapping in the only
place where nfserr_wrongsec is generated.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index cb777fe8298813e3a3d5196eb36ebe5da7ea8b57..21e404e7cb68c718c20f67f76714a26f14f1d4d0 100644 (file)
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1002,7 +1002,7 @@ __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp)
        if (nfsd4_spo_must_allow(rqstp))
                return 0;
 
-       return nfserr_wrongsec;
+       return rqstp->rq_vers < 4 ? nfserr_acces : nfserr_wrongsec;
 }
 
 /*

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 4aa8db879ca2816c5214641f6604154b90c461ac..beb3875241cbc8998c024334eb443942c1784388 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -964,8 +964,6 @@ static __be32 map_new_errors(u32 vers, __be32 nfserr)
 {
        if (nfserr == nfserr_jukebox && vers == 2)
                return nfserr_dropit;
-       if (nfserr == nfserr_wrongsec && vers < 4)
-               return nfserr_acces;
        return nfserr;
 }