Merge pull request #247 from shreyassiravara/read-ahead-underflow

Avoid underflow in readahead when offset < NFS_BLKSIZE
libnfs-4.0.0-vitalif
Ronnie Sahlberg 2018-04-29 10:20:32 +10:00 committed by GitHub
commit 5582eaede3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -4669,7 +4669,7 @@ nfs3_pread_async_internal(struct nfs_context *nfs, struct nfsfh *nfsfh,
if (nfs->rpc->readahead) {
nfsfh->ra.cur_ra = MAX(NFS_BLKSIZE, nfsfh->ra.cur_ra);
if (offset >= nfsfh->ra.fh_offset &&
offset - NFS_BLKSIZE <= nfsfh->ra.fh_offset + nfsfh->ra.cur_ra) {
offset <= nfsfh->ra.fh_offset + nfsfh->ra.cur_ra + NFS_BLKSIZE) {
if (nfs->rpc->readahead > nfsfh->ra.cur_ra) {
nfsfh->ra.cur_ra <<= 1;
}