diff options
| author | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
| commit | 95e1ffb15694e54f29f8baaa4232152b703c2a5a (patch) | |
| tree | d6510e195bc06092a8057e34c6442eba4e77d09a /sys/compat/linux/common/linux_mtio.c | |
| parent | 4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff) | |
merge ktrace-lwp.
Diffstat (limited to 'sys/compat/linux/common/linux_mtio.c')
| -rw-r--r-- | sys/compat/linux/common/linux_mtio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/compat/linux/common/linux_mtio.c b/sys/compat/linux/common/linux_mtio.c index 573ffad302d..82ce93458b9 100644 --- a/sys/compat/linux/common/linux_mtio.c +++ b/sys/compat/linux/common/linux_mtio.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_mtio.c,v 1.1 2005/02/28 22:11:32 soren Exp $ */ +/* $NetBSD: linux_mtio.c,v 1.2 2005/12/11 12:20:19 christos Exp $ */ /* * Copyright (c) 2005 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_mtio.c,v 1.1 2005/02/28 22:11:32 soren Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_mtio.c,v 1.2 2005/12/11 12:20:19 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,19 +70,19 @@ static const struct mtop_mapping { }; int -linux_ioctl_mtio(struct proc *p, struct linux_sys_ioctl_args *uap, +linux_ioctl_mtio(struct lwp *l, struct linux_sys_ioctl_args *uap, register_t *retval) { struct file *fp; struct filedesc *fdp; u_long com = SCARG(uap, com); int i, error = 0; - int (*ioctlf)(struct file *, u_long, void *, struct proc *); + int (*ioctlf)(struct file *, u_long, void *, struct lwp *); struct linux_mtop lmtop; struct linux_mtget lmtget; struct mtop mt; - fdp = p->p_fd; + fdp = l->l_proc->p_fd; if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL) return EBADF; @@ -105,7 +105,7 @@ linux_ioctl_mtio(struct proc *p, struct linux_sys_ioctl_args *uap, mt.mt_op = mtop_map[i].op; mt.mt_count = lmtop.mt_count; - error = ioctlf(fp, MTIOCTOP, (caddr_t)&mt, p); + error = ioctlf(fp, MTIOCTOP, (caddr_t)&mt, l); break; case LINUX_MTIOCGET: lmtget.mt_type = LINUX_MT_ISUNKNOWN; @@ -124,7 +124,7 @@ linux_ioctl_mtio(struct proc *p, struct linux_sys_ioctl_args *uap, break; } - FILE_UNUSE(fp, p); + FILE_UNUSE(fp, l); return error; } |
