diff mbox series

NFSD: Fix oversight in .pc_func conversion

Message ID 160235898066.206859.15214008370147838310.stgit@klimt.1015granger.net (mailing list archive)
State New, archived
Headers show
Series NFSD: Fix oversight in .pc_func conversion | expand

Commit Message

Chuck Lever Oct. 10, 2020, 7:43 p.m. UTC 
nfsd_proc_setattr() needs to return an accept_stat value, not an
nfserr status code, when fh_verify() fails.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfsd/nfsproc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Oops.

Comments

J. Bruce Fields Oct. 12, 2020, 2:28 p.m. UTC | #1 
On Sat, Oct 10, 2020 at 03:43:15PM -0400, Chuck Lever wrote:
> nfsd_proc_setattr() needs to return an accept_stat value, not an
> nfserr status code, when fh_verify() fails.

Thanks!  I'll fold that into "NFSD: Hoist status code encoding into XDR
encoder functions".

--b.

> 
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  fs/nfsd/nfsproc.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Oops.
> 
> diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
> index f2450c719032..0d71549f9d42 100644
> --- a/fs/nfsd/nfsproc.c
> +++ b/fs/nfsd/nfsproc.c
> @@ -85,7 +85,7 @@ nfsd_proc_setattr(struct svc_rqst *rqstp)
>  
>  		resp->status = fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP);
>  		if (resp->status != nfs_ok)
> -			return resp->status;
> +			goto out;
>  
>  		if (delta < 0)
>  			delta = -delta;
>
diff mbox series

Patch

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index f2450c719032..0d71549f9d42 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -85,7 +85,7 @@  nfsd_proc_setattr(struct svc_rqst *rqstp)
 
 		resp->status = fh_verify(rqstp, fhp, 0, NFSD_MAY_NOP);
 		if (resp->status != nfs_ok)
-			return resp->status;
+			goto out;
 
 		if (delta < 0)
 			delta = -delta;