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

Add a missing dev_relthread() call.

Browse Source 
Remove unused variable.

Spotted by:	Hans Petter Selasky <hselasky@c2i.net>
This commit is contained in:
Poul-Henning Kamp 2005-08-29 11:14:18 +00:00
parent 83c83f3e46
commit 80447bf701
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/fs/devfs/devfs_vnops.c
View File

@ -537,8 +537,11 @@ devfs_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred, struc
p = devtoname(dev); p = devtoname(dev);
i = strlen(p) + 1; i = strlen(p) + 1;
if (i > fgn->len) if (i > fgn->len)
return (EINVAL); error = EINVAL;
return (copyout(p, fgn->buf, i)); else
error = copyout(p, fgn->buf, i);
dev_relthread(dev);
return (error);
} }
error = dsw->d_ioctl(dev, com, data, fp->f_flag, td); error = dsw->d_ioctl(dev, com, data, fp->f_flag, td);
dev_relthread(dev); 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) devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td)
{ {
struct cdev *dev; struct cdev *dev;
struct vnode *vp;
int error, ioflag, resid; int error, ioflag, resid;
struct cdevsw *dsw; struct cdevsw *dsw;
@ -1383,7 +1385,6 @@ devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, s
if (error) if (error)
return (error); return (error);
KASSERT(uio->uio_td == td, ("uio_td %p is not td %p", uio->uio_td, td)); 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); ioflag = fp->f_flag & (O_NONBLOCK | O_DIRECT | O_FSYNC);
if (ioflag & O_DIRECT) if (ioflag & O_DIRECT)
ioflag |= IO_DIRECT; ioflag |= IO_DIRECT;