Skip to content

Commit

Permalink
NFSD: restore EINVAL error translation in nfsd_commit()
Browse files Browse the repository at this point in the history
commit 8a9ffb8 upstream.

commit 555dbf1 ("nfsd: Replace use of rwsem with errseq_t")
incidentally broke translation of -EINVAL to nfserr_notsupp.
The patch restores that.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Fixes: 555dbf1 ("nfsd: Replace use of rwsem with errseq_t")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
khoroshilov authored and gregkh committed Jul 7, 2022
1 parent db82bb6 commit 208ff79
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/nfsd/vfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1156,15 +1156,16 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
nfsd_net_id));
err2 = filemap_check_wb_err(nf->nf_file->f_mapping,
since);
err = nfserrno(err2);
break;
case -EINVAL:
err = nfserr_notsupp;
break;
default:
nfsd_reset_boot_verifier(net_generic(nf->nf_net,
nfsd_net_id));
err = nfserrno(err2);
}
err = nfserrno(err2);
} else
nfsd_copy_boot_verifier(verf, net_generic(nf->nf_net,
nfsd_net_id));
Expand Down

0 comments on commit 208ff79

Please sign in to comment.