d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't set IN_ACCESS for requests to read 0 bytes or for unsuccessful reads.

Browse Source 
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:
Bruce Evans 1999-07-25 02:56:17 +00:00
parent 3dfdfdb27f
commit 2ac6e74655
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/gnu/ext2fs/ext2_readwrite.c
View File

@ -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);
}

6
sys/gnu/fs/ext2fs/ext2_readwrite.c
View File

@ -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);
}