Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bogus uio->uio_offset check introduced in rev. 1.5, which effectively 

disabled loans for writes (a.k.a "direct write"), oops; use uio->uio_resid
for the check instead

don't bother updating uio->uio_offset in pipe_direct_write(), it's not used
by upper layers anyway
This commit is contained in:
jdolecek 2001-07-17 18:18:52 +00:00
parent f9c5bef128
commit db3510e6f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/sys_pipe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_pipe.c,v 1.6 2001/07/17 06:05:28 jdolecek Exp $ */
/* $NetBSD: sys_pipe.c,v 1.7 2001/07/17 18:18:52 jdolecek Exp $ */
/*
* Copyright (c) 1996 John S. Dyson
@ -1128,8 +1128,8 @@ retry:
return (error);
}
uio->uio_offset += bcnt;
uio->uio_resid -= bcnt;
/* uio_offset not updated, not set/uset for write(2) */
return (0);
}
@ -1222,7 +1222,7 @@ pipe_write(fp, offset, uio, cred, flags)
* away on us.
*/
if ((uio->uio_iov[0].iov_len >= PIPE_MINDIRECT) &&
(uio->uio_offset == 0) &&
(uio->uio_resid == orig_resid) &&
(fp->f_flag & FNONBLOCK) == 0 &&
(wpipe->pipe_map.kva || (amountpipekva < limitpipekva))) {
error = pipe_direct_write(wpipe, uio);