diff options
| author | phk <phk@FreeBSD.org> | 2005-08-29 11:14:18 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2005-08-29 11:14:18 +0000 |
| commit | a469be1ef35339bc40e26dc3259862541751daca (patch) | |
| tree | 5571819b299a82cd9f882df9d12002757a7c4a7d /sys/fs/devfs | |
| parent | b87dfd9adc869c00923a271f6fc5430ea97b019f (diff) | |
| download | FreeBSD-src-a469be1ef35339bc40e26dc3259862541751daca.zip FreeBSD-src-a469be1ef35339bc40e26dc3259862541751daca.tar.gz | |
Add a missing dev_relthread() call.
Remove unused variable.
Spotted by: Hans Petter Selasky <hselasky@c2i.net>
Diffstat (limited to 'sys/fs/devfs')
| -rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index e5b6ba3..3d3484b 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -537,8 +537,11 @@ devfs_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred, struc p = devtoname(dev); i = strlen(p) + 1; if (i > fgn->len) - return (EINVAL); - return (copyout(p, fgn->buf, i)); + error = EINVAL; + else + error = copyout(p, fgn->buf, i); + dev_relthread(dev); + return (error); } error = dsw->d_ioctl(dev, com, data, fp->f_flag, td); dev_relthread(dev); @@ -1375,7 +1378,6 @@ static int devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) { struct cdev *dev; - struct vnode *vp; int error, ioflag, resid; struct cdevsw *dsw; @@ -1383,7 +1385,6 @@ devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, s if (error) return (error); KASSERT(uio->uio_td == td, ("uio_td %p is not td %p", uio->uio_td, td)); - vp = fp->f_vnode; ioflag = fp->f_flag & (O_NONBLOCK | O_DIRECT | O_FSYNC); if (ioflag & O_DIRECT) ioflag |= IO_DIRECT; |
