diff options
| author |   Chuck Lever <chuck.lever@oracle.com> | 2020-10-01 19:00:00 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2020-10-02 09:37:42 -0400 |
| commit | 4b74fd793a77f6149d68dbf95574311af9506e39 (patch) | |
| tree | a9dc7b3418f183e5706ff572860483db563ca115 | |
| parent | NFSD: Remove the RETURN_STATUS() macro (diff) | |
| download | linux-dev-4b74fd793a77f6149d68dbf95574311af9506e39.tar.xz linux-dev-4b74fd793a77f6149d68dbf95574311af9506e39.zip | |
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>
| -rw-r--r-- | fs/nfsd/export.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/nfssvc.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index cb777fe82988..21e404e7cb68 100644 --- 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 4aa8db879ca2..beb3875241cb 100644 --- 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; } |