Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nfsd-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
"Notable regression fixes:
- Fix NFSD crash during NFSv4.2 READ_PLUS operation
- Fix incorrect status code returned by COMMIT operation"
* tag 'nfsd-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
SUNRPC: Fix READ_PLUS crasher
NFSD: restore EINVAL error translation in nfsd_commit()
+3
-2
+2
-1
fs/nfsd/vfs.c
+2
-1
fs/nfsd/vfs.c
···
1179
1179
nfsd_copy_write_verifier(verf, nn);
1180
1180
err2 = filemap_check_wb_err(nf->nf_file->f_mapping,
1181
1181
since);
1182
+
err = nfserrno(err2);
1182
1183
break;
1183
1184
case -EINVAL:
1184
1185
err = nfserr_notsupp;
···
1187
1186
default:
1188
1187
nfsd_reset_write_verifier(nn);
1189
1188
trace_nfsd_writeverf_reset(nn, rqstp, err2);
1189
+
err = nfserrno(err2);
1190
1190
}
1191
-
err = nfserrno(err2);
1192
1191
} else
1193
1192
nfsd_copy_write_verifier(verf, nn);
1194
1193
+1
-1
net/sunrpc/xdr.c
+1
-1
net/sunrpc/xdr.c
···
984
984
p = page_address(*xdr->page_ptr);
985
985
xdr->p = p + frag2bytes;
986
986
space_left = xdr->buf->buflen - xdr->buf->len;
987
-
if (space_left - nbytes >= PAGE_SIZE)
987
+
if (space_left - frag1bytes >= PAGE_SIZE)
988
988
xdr->end = p + PAGE_SIZE;
989
989
else
990
990
xdr->end = p + space_left - frag1bytes;