diff options
| author | phk <phk@FreeBSD.org> | 2004-12-13 07:41:19 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-13 07:41:19 +0000 |
| commit | 4e2d779c7a83fcfe199d376127355445accd0123 (patch) | |
| tree | 277747407d82a263b64a3e1abca86228823eb910 | |
| parent | 381851ecfeabb9fb6a87658734215cfc6be526c0 (diff) | |
| download | FreeBSD-src-4e2d779c7a83fcfe199d376127355445accd0123.zip FreeBSD-src-4e2d779c7a83fcfe199d376127355445accd0123.tar.gz | |
Another FNONBLOCK -> O_NONBLOCK.
Don't unconditionally set IO_UNIT to device drivers in write: nobody
checks it, and since it was always set it did not carry information anyway.
| -rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 2ff7a79..4eba833 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -1345,8 +1345,8 @@ devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, s return (error); KASSERT(uio->uio_td == td, ("uio_td %p is not td %p", uio->uio_td, td)); vp = fp->f_vnode; - ioflag = IO_UNIT; - if (fp->f_flag & FNONBLOCK) + ioflag = 0; + if (fp->f_flag & O_NONBLOCK) ioflag |= IO_NDELAY; if (fp->f_flag & O_DIRECT) ioflag |= IO_DIRECT; |
