mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
Don't set IN_ACCESS for requests to read 0 bytes or for unsuccessful reads.
Translated from: similar fixes in ufs_readwrite.c rev.1.61. Things are simpler (but annoyingly different) here because there are no vm optimisations.
This commit is contained in:
parent
3dfdfdb27f
commit
2ac6e74655
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=49074
@ -68,7 +68,7 @@ READ(ap)
|
||||
daddr_t lbn, nextlbn;
|
||||
off_t bytesinfile;
|
||||
long size, xfersize, blkoffset;
|
||||
int error;
|
||||
int error, orig_resid;
|
||||
u_short mode;
|
||||
|
||||
vp = ap->a_vp;
|
||||
@ -92,6 +92,7 @@ READ(ap)
|
||||
return (EFBIG);
|
||||
#endif
|
||||
|
||||
orig_resid = uio->uio_resid;
|
||||
for (error = 0, bp = NULL; uio->uio_resid > 0; bp = NULL) {
|
||||
if ((bytesinfile = ip->i_size - uio->uio_offset) <= 0)
|
||||
break;
|
||||
@ -147,7 +148,8 @@ READ(ap)
|
||||
}
|
||||
if (bp != NULL)
|
||||
bqrelse(bp);
|
||||
if (!(vp->v_mount->mnt_flag & MNT_NOATIME))
|
||||
if (orig_resid > 0 && (error == 0 || uio->uio_resid != orig_resid) &&
|
||||
(vp->v_mount->mnt_flag & MNT_NOATIME) == 0)
|
||||
ip->i_flag |= IN_ACCESS;
|
||||
return (error);
|
||||
}
|
||||
|
@ -68,7 +68,7 @@ READ(ap)
|
||||
daddr_t lbn, nextlbn;
|
||||
off_t bytesinfile;
|
||||
long size, xfersize, blkoffset;
|
||||
int error;
|
||||
int error, orig_resid;
|
||||
u_short mode;
|
||||
|
||||
vp = ap->a_vp;
|
||||
@ -92,6 +92,7 @@ READ(ap)
|
||||
return (EFBIG);
|
||||
#endif
|
||||
|
||||
orig_resid = uio->uio_resid;
|
||||
for (error = 0, bp = NULL; uio->uio_resid > 0; bp = NULL) {
|
||||
if ((bytesinfile = ip->i_size - uio->uio_offset) <= 0)
|
||||
break;
|
||||
@ -147,7 +148,8 @@ READ(ap)
|
||||
}
|
||||
if (bp != NULL)
|
||||
bqrelse(bp);
|
||||
if (!(vp->v_mount->mnt_flag & MNT_NOATIME))
|
||||
if (orig_resid > 0 && (error == 0 || uio->uio_resid != orig_resid) &&
|
||||
(vp->v_mount->mnt_flag & MNT_NOATIME) == 0)
|
||||
ip->i_flag |= IN_ACCESS;
|
||||
return (error);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user