Module Name: src
Committed By: matt
Date: Fri Sep 5 09:21:55 UTC 2014
Modified Files:
src/sys/compat/common: if_43.c uipc_syscalls_43.c vfs_syscalls_12.c
vfs_syscalls_20.c vfs_syscalls_30.c vfs_syscalls_43.c
vfs_syscalls_50.c
src/sys/compat/ibcs2: ibcs2_misc.c ibcs2_stat.c
src/sys/compat/netbsd32: netbsd32_compat_20.c netbsd32_compat_50.c
netbsd32_fs.c
src/sys/compat/osf1: osf1_file.c osf1_mount.c
src/sys/compat/ossaudio: ossaudio.c
src/sys/compat/sunos: sunos_ioctl.c sunos_misc.c
src/sys/compat/sunos32: sunos32_ioctl.c sunos32_misc.c
src/sys/compat/svr4: svr4_fcntl.c svr4_misc.c svr4_net.c svr4_socket.c
svr4_stream.c
src/sys/compat/svr4_32: svr4_32_fcntl.c svr4_32_misc.c svr4_32_net.c
svr4_32_socket.c
src/sys/compat/ultrix: ultrix_pathname.c
Log Message:
Try not to use f_data, use f_{vnode,socket,pipe,mqueue,kqueue,ksem} to get
a correctly typed pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/common/uipc_syscalls_43.c
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/common/vfs_syscalls_12.c
cvs rdiff -u -r1.37 -r1.38 src/sys/compat/common/vfs_syscalls_20.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/common/vfs_syscalls_30.c
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/common/vfs_syscalls_43.c
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/common/vfs_syscalls_50.c
cvs rdiff -u -r1.112 -r1.113 src/sys/compat/ibcs2/ibcs2_misc.c
cvs rdiff -u -r1.47 -r1.48 src/sys/compat/ibcs2/ibcs2_stat.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.26 -r1.27 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/netbsd32/netbsd32_fs.c
cvs rdiff -u -r1.42 -r1.43 src/sys/compat/osf1/osf1_file.c
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/osf1/osf1_mount.c
cvs rdiff -u -r1.68 -r1.69 src/sys/compat/ossaudio/ossaudio.c
cvs rdiff -u -r1.61 -r1.62 src/sys/compat/sunos/sunos_ioctl.c
cvs rdiff -u -r1.168 -r1.169 src/sys/compat/sunos/sunos_misc.c
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/sunos32/sunos32_ioctl.c
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/sunos32/sunos32_misc.c
cvs rdiff -u -r1.71 -r1.72 src/sys/compat/svr4/svr4_fcntl.c
cvs rdiff -u -r1.155 -r1.156 src/sys/compat/svr4/svr4_misc.c
cvs rdiff -u -r1.60 -r1.61 src/sys/compat/svr4/svr4_net.c
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/svr4/svr4_socket.c
cvs rdiff -u -r1.80 -r1.81 src/sys/compat/svr4/svr4_stream.c
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/svr4_32/svr4_32_fcntl.c
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/svr4_32/svr4_32_misc.c
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/svr4_32/svr4_32_net.c
cvs rdiff -u -r1.12 -r1.13 src/sys/compat/svr4_32/svr4_32_socket.c
cvs rdiff -u -r1.38 -r1.39 src/sys/compat/ultrix/ultrix_pathname.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.7 src/sys/compat/common/if_43.c:1.8
--- src/sys/compat/common/if_43.c:1.7 Tue Jul 1 05:49:18 2014
+++ src/sys/compat/common/if_43.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.7 2014/07/01 05:49:18 rtr Exp $ */
+/* $NetBSD: if_43.c,v 1.8 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.7 2014/07/01 05:49:18 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.8 2014/09/05 09:21:54 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -216,7 +216,7 @@ compat_ifioctl(struct socket *so, u_long
struct lwp *l)
{
int error;
- struct ifreq *ifr = data;
+ struct ifreq *ifr = (struct ifreq *)data;
struct ifnet *ifp = ifunit(ifr->ifr_name);
struct sockaddr *sa;
Index: src/sys/compat/common/uipc_syscalls_43.c
diff -u src/sys/compat/common/uipc_syscalls_43.c:1.44 src/sys/compat/common/uipc_syscalls_43.c:1.45
--- src/sys/compat/common/uipc_syscalls_43.c:1.44 Fri Nov 14 23:10:57 2008
+++ src/sys/compat/common/uipc_syscalls_43.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_43.c,v 1.44 2008/11/14 23:10:57 ad Exp $ */
+/* $NetBSD: uipc_syscalls_43.c,v 1.45 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.44 2008/11/14 23:10:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.45 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@ compat_43_sys_accept(struct lwp *l, cons
} */
int error;
- if ((error = sys_accept(l, (const void *)uap, retval)) != 0)
+ if ((error = sys_accept(l, (const struct sys_accept_args *)uap, retval)) != 0)
return error;
if (SCARG(uap, name)
@@ -113,7 +113,7 @@ compat_43_sys_getpeername(struct lwp *l,
int error;
- if ((error = sys_getpeername(l, (const void *)uap, retval)) != 0)
+ if ((error = sys_getpeername(l, (const struct sys_getpeername_args *)uap, retval)) != 0)
return error;
if ((error = compat_43_sa_put(SCARG(uap, asa))))
@@ -132,7 +132,7 @@ compat_43_sys_getsockname(struct lwp *l,
} */
int error;
- if ((error = sys_getsockname(l, (const void *)uap, retval)) != 0)
+ if ((error = sys_getsockname(l, (const struct sys_getsockname_args *)uap, retval)) != 0)
return error;
if ((error = compat_43_sa_put(SCARG(uap, asa))))
@@ -175,7 +175,7 @@ compat_43_sys_recvfrom(struct lwp *l, co
} */
int error;
- if ((error = sys_recvfrom(l, (const void *)uap, retval)))
+ if ((error = sys_recvfrom(l, (const struct sys_recvfrom_args *)uap, retval)))
return (error);
if (SCARG(uap, from) && (error = compat_43_sa_put(SCARG(uap, from))))
@@ -228,7 +228,7 @@ compat_43_sys_recvmsg(struct lwp *l, con
* XXX: maybe there can be more than one chunk of control data?
*/
if (omsg.msg_accrights && control != NULL) {
- struct cmsghdr *cmsg = mtod(control, void *);
+ struct cmsghdr *cmsg = mtod(control, struct cmsghdr *);
if (cmsg->cmsg_level == SOL_SOCKET
&& cmsg->cmsg_type == SCM_RIGHTS
@@ -249,7 +249,7 @@ compat_43_sys_recvmsg(struct lwp *l, con
mtod(from, struct osockaddr *)->sa_family =
mtod(from, struct sockaddr *)->sa_family;
- error = copyout_sockname(omsg.msg_name, &omsg.msg_namelen, 0, from);
+ error = copyout_sockname((struct sockaddr *)omsg.msg_name, &omsg.msg_namelen, 0, from);
if (from != NULL)
m_free(from);
@@ -301,7 +301,7 @@ compat43_set_accrights(struct msghdr *ms
ctl = m_get(M_WAIT, MT_CONTROL);
ctl->m_len = clen;
- cmsg = mtod(ctl, void *);
+ cmsg = mtod(ctl, struct cmsghdr *);
cmsg->cmsg_len = CMSG_SPACE(accrightslen);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
@@ -348,8 +348,8 @@ compat_43_sys_sendmsg(struct lwp *l, con
if (error != 0)
return (error);
- sa = mtod(nam, void *);
- osa = mtod(nam, void *);
+ sa = mtod(nam, struct sockaddr *);
+ osa = mtod(nam, struct osockaddr *);
sa->sa_family = osa->sa_family;
sa->sa_len = omsg.msg_namelen;
Index: src/sys/compat/common/vfs_syscalls_12.c
diff -u src/sys/compat/common/vfs_syscalls_12.c:1.30 src/sys/compat/common/vfs_syscalls_12.c:1.31
--- src/sys/compat/common/vfs_syscalls_12.c:1.30 Fri Jan 24 22:11:46 2014
+++ src/sys/compat/common/vfs_syscalls_12.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_12.c,v 1.30 2014/01/24 22:11:46 christos Exp $ */
+/* $NetBSD: vfs_syscalls_12.c,v 1.31 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.30 2014/01/24 22:11:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.31 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ compat_12_sys_getdirentries(struct lwp *
goto out1;
}
- vp = (struct vnode *)fp->f_data;
+ vp = (struct vnode *)fp->f_vnode;
if (vp->v_type != VDIR) {
error = ENOTDIR;
goto out1;
Index: src/sys/compat/common/vfs_syscalls_20.c
diff -u src/sys/compat/common/vfs_syscalls_20.c:1.37 src/sys/compat/common/vfs_syscalls_20.c:1.38
--- src/sys/compat/common/vfs_syscalls_20.c:1.37 Wed Nov 27 17:24:44 2013
+++ src/sys/compat/common/vfs_syscalls_20.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_20.c,v 1.37 2013/11/27 17:24:44 christos Exp $ */
+/* $NetBSD: vfs_syscalls_20.c,v 1.38 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_20.c,v 1.37 2013/11/27 17:24:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_20.c,v 1.38 2014/09/05 09:21:54 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -179,7 +179,7 @@ compat_20_sys_fstatfs(struct lwp *l, con
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
- mp = ((struct vnode *)fp->f_data)->v_mount;
+ mp = fp->f_vnode->v_mount;
sbuf = malloc(sizeof(*sbuf), M_TEMP, M_WAITOK);
if ((error = dostatvfs(mp, sbuf, l, 0, 1)) != 0)
goto out;
Index: src/sys/compat/common/vfs_syscalls_30.c
diff -u src/sys/compat/common/vfs_syscalls_30.c:1.33 src/sys/compat/common/vfs_syscalls_30.c:1.34
--- src/sys/compat/common/vfs_syscalls_30.c:1.33 Fri Nov 19 06:44:35 2010
+++ src/sys/compat/common/vfs_syscalls_30.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_30.c,v 1.33 2010/11/19 06:44:35 dholland Exp $ */
+/* $NetBSD: vfs_syscalls_30.c,v 1.34 2014/09/05 09:21:54 matt Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.33 2010/11/19 06:44:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.34 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,7 +227,7 @@ compat_30_sys_getdents(struct lwp *l, co
goto out1;
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
Index: src/sys/compat/common/vfs_syscalls_43.c
diff -u src/sys/compat/common/vfs_syscalls_43.c:1.56 src/sys/compat/common/vfs_syscalls_43.c:1.57
--- src/sys/compat/common/vfs_syscalls_43.c:1.56 Tue Jan 28 01:29:04 2014
+++ src/sys/compat/common/vfs_syscalls_43.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_43.c,v 1.56 2014/01/28 01:29:04 christos Exp $ */
+/* $NetBSD: vfs_syscalls_43.c,v 1.57 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.56 2014/01/28 01:29:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.57 2014/09/05 09:21:54 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -300,7 +300,7 @@ compat_43_sys_lseek(struct lwp *l, const
SCARG(&nuap, fd) = SCARG(uap, fd);
SCARG(&nuap, offset) = SCARG(uap, offset);
SCARG(&nuap, whence) = SCARG(uap, whence);
- error = sys_lseek(l, &nuap, (void *)&qret);
+ error = sys_lseek(l, &nuap, (register_t *)&qret);
*(long *)retval = qret;
return (error);
}
@@ -351,7 +351,8 @@ compat_43_sys_getdirentries(struct lwp *
} */
struct dirent *bdp;
struct vnode *vp;
- char *inp, *tbuf; /* Current-format */
+ void *tbuf; /* Current-format */
+ char *inp; /* Current-format */
int len, reclen; /* Current-format */
char *outp; /* Dirent12-format */
int resid, old_reclen = 0; /* Dirent12-format */
@@ -375,7 +376,7 @@ compat_43_sys_getdirentries(struct lwp *
goto out1;
}
- vp = (struct vnode *)fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = ENOTDIR;
goto out1;
@@ -414,7 +415,7 @@ again:
if (error)
goto out;
- inp = tbuf;
+ inp = (char *)tbuf;
outp = SCARG(uap, buf);
resid = nbytes;
if ((len = buflen - auio.uio_resid) == 0)
Index: src/sys/compat/common/vfs_syscalls_50.c
diff -u src/sys/compat/common/vfs_syscalls_50.c:1.17 src/sys/compat/common/vfs_syscalls_50.c:1.18
--- src/sys/compat/common/vfs_syscalls_50.c:1.17 Tue Mar 13 18:40:29 2012
+++ src/sys/compat/common/vfs_syscalls_50.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_50.c,v 1.17 2012/03/13 18:40:29 elad Exp $ */
+/* $NetBSD: vfs_syscalls_50.c,v 1.18 2014/09/05 09:21:54 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.17 2012/03/13 18:40:29 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.18 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -244,7 +244,7 @@ compat_50_sys_futimes(struct lwp *l,
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return error;
- error = compat_50_do_sys_utimes(l, fp->f_data, NULL, 0,
+ error = compat_50_do_sys_utimes(l, fp->f_vnode, NULL, 0,
SCARG(uap, tptr));
fd_putfile(SCARG(uap, fd));
return error;
Index: src/sys/compat/ibcs2/ibcs2_misc.c
diff -u src/sys/compat/ibcs2/ibcs2_misc.c:1.112 src/sys/compat/ibcs2/ibcs2_misc.c:1.113
--- src/sys/compat/ibcs2/ibcs2_misc.c:1.112 Tue Oct 2 01:44:27 2012
+++ src/sys/compat/ibcs2/ibcs2_misc.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ibcs2_misc.c,v 1.112 2012/10/02 01:44:27 christos Exp $ */
+/* $NetBSD: ibcs2_misc.c,v 1.113 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.112 2012/10/02 01:44:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.113 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -393,7 +393,7 @@ ibcs2_sys_getdents(struct lwp *l, const
error = EBADF;
goto out1;
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
@@ -531,7 +531,7 @@ ibcs2_sys_read(struct lwp *l, const stru
error = EBADF;
goto out1;
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
fd_putfile(SCARG(uap, fd));
return sys_read(l, (const void *)uap, retval);
Index: src/sys/compat/ibcs2/ibcs2_stat.c
diff -u src/sys/compat/ibcs2/ibcs2_stat.c:1.47 src/sys/compat/ibcs2/ibcs2_stat.c:1.48
--- src/sys/compat/ibcs2/ibcs2_stat.c:1.47 Mon Jun 29 05:08:16 2009
+++ src/sys/compat/ibcs2/ibcs2_stat.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ibcs2_stat.c,v 1.47 2009/06/29 05:08:16 dholland Exp $ */
+/* $NetBSD: ibcs2_stat.c,v 1.48 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1995, 1998 Scott Bartram
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_stat.c,v 1.47 2009/06/29 05:08:16 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_stat.c,v 1.48 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,7 +171,7 @@ ibcs2_sys_fstatfs(struct lwp *l, const s
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
- mp = ((struct vnode *)fp->f_data)->v_mount;
+ mp = fp->f_vnode->v_mount;
sp = &mp->mnt_stat;
if ((error = VFS_STATVFS(mp, sp)) != 0)
goto out;
@@ -223,7 +223,7 @@ ibcs2_sys_fstatvfs(struct lwp *l, const
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
- mp = ((struct vnode *)fp->f_data)->v_mount;
+ mp = fp->f_vnode->v_mount;
sp = &mp->mnt_stat;
if ((error = VFS_STATVFS(mp, sp)) != 0)
goto out;
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.33 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.34
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.33 Fri Jan 24 23:20:33 2014
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.33 2014/01/24 23:20:33 christos Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.34 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.33 2014/01/24 23:20:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.34 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -190,7 +190,7 @@ compat_20_netbsd32_fstatfs(struct lwp *l
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
- mp = ((struct vnode *)fp->f_data)->v_mount;
+ mp = fp->f_vnode->v_mount;
sb = &mp->mnt_stat;
if ((error = dostatvfs(mp, sb, l, 0, 0)) != 0)
goto out;
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.26 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.27
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.26 Fri Sep 5 05:26:26 2014
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.26 2014/09/05 05:26:26 matt Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.27 2014/09/05 09:21:54 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.26 2014/09/05 05:26:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.27 2014/09/05 09:21:54 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -296,7 +296,7 @@ compat_50_netbsd32_futimes(struct lwp *l
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return error;
- error = do_sys_utimes(l, fp->f_data, NULL, 0, tvp, UIO_SYSSPACE);
+ error = do_sys_utimes(l, fp->f_vnode, NULL, 0, tvp, UIO_SYSSPACE);
fd_putfile(SCARG(uap, fd));
return error;
Index: src/sys/compat/netbsd32/netbsd32_fs.c
diff -u src/sys/compat/netbsd32/netbsd32_fs.c:1.70 src/sys/compat/netbsd32/netbsd32_fs.c:1.71
--- src/sys/compat/netbsd32/netbsd32_fs.c:1.70 Wed Apr 30 17:23:45 2014
+++ src/sys/compat/netbsd32/netbsd32_fs.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_fs.c,v 1.70 2014/04/30 17:23:45 njoly Exp $ */
+/* $NetBSD: netbsd32_fs.c,v 1.71 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.70 2014/04/30 17:23:45 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.71 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -491,7 +491,7 @@ netbsd32___futimes50(struct lwp *l, cons
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
- error = do_sys_utimes(l, fp->f_data, NULL, 0, tvp, UIO_SYSSPACE);
+ error = do_sys_utimes(l, fp->f_vnode, NULL, 0, tvp, UIO_SYSSPACE);
fd_putfile(SCARG(uap, fd));
return (error);
@@ -649,7 +649,7 @@ netbsd32_preadv(struct lwp *l, const str
return (EBADF);
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
error = ESPIPE;
goto out;
@@ -695,7 +695,7 @@ netbsd32_pwritev(struct lwp *l, const st
return (EBADF);
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
error = ESPIPE;
goto out;
@@ -1301,7 +1301,7 @@ netbsd32_futimens(struct lwp *l, const s
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
- error = do_sys_utimensat(l, AT_FDCWD, fp->f_data, NULL, 0,
+ error = do_sys_utimensat(l, AT_FDCWD, fp->f_vnode, NULL, 0,
tsp, UIO_SYSSPACE);
fd_putfile(SCARG(uap, fd));
return (error);
Index: src/sys/compat/osf1/osf1_file.c
diff -u src/sys/compat/osf1/osf1_file.c:1.42 src/sys/compat/osf1/osf1_file.c:1.43
--- src/sys/compat/osf1/osf1_file.c:1.42 Sun Aug 24 12:48:58 2014
+++ src/sys/compat/osf1/osf1_file.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_file.c,v 1.42 2014/08/24 12:48:58 maxv Exp $ */
+/* $NetBSD: osf1_file.c,v 1.43 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.42 2014/08/24 12:48:58 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.43 2014/09/05 09:21:54 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -164,7 +164,7 @@ osf1_sys_getdirentries(struct lwp *l, co
goto out1;
}
- vp = (struct vnode *)fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
Index: src/sys/compat/osf1/osf1_mount.c
diff -u src/sys/compat/osf1/osf1_mount.c:1.51 src/sys/compat/osf1/osf1_mount.c:1.52
--- src/sys/compat/osf1/osf1_mount.c:1.51 Thu Aug 21 06:40:35 2014
+++ src/sys/compat/osf1/osf1_mount.c Fri Sep 5 09:21:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_mount.c,v 1.51 2014/08/21 06:40:35 maxv Exp $ */
+/* $NetBSD: osf1_mount.c,v 1.52 2014/09/05 09:21:54 matt Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.51 2014/08/21 06:40:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.52 2014/09/05 09:21:54 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,7 +116,7 @@ osf1_sys_fstatfs(struct lwp *l, const st
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)))
return (error);
- mp = ((struct vnode *)fp->f_data)->v_mount;
+ mp = fp->f_vnode->v_mount;
sp = &mp->mnt_stat;
if ((error = VFS_STATVFS(mp, sp)))
goto out;
Index: src/sys/compat/ossaudio/ossaudio.c
diff -u src/sys/compat/ossaudio/ossaudio.c:1.68 src/sys/compat/ossaudio/ossaudio.c:1.69
--- src/sys/compat/ossaudio/ossaudio.c:1.68 Thu Sep 19 18:50:36 2013
+++ src/sys/compat/ossaudio/ossaudio.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.68 2013/09/19 18:50:36 christos Exp $ */
+/* $NetBSD: ossaudio.c,v 1.69 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.68 2013/09/19 18:50:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.69 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -941,7 +941,7 @@ getdevinfo(file_t *fp)
* Figure out what device it is so we can check if the
* cached data is valid.
*/
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VCHR)
return 0;
vn_lock(vp, LK_SHARED | LK_RETRY);
@@ -1046,8 +1046,8 @@ oss_ioctl_mixer(struct lwp *lwp, const s
int l, r, n, e;
int (*ioctlf)(file_t *, u_long, void *);
- if ((fp = fd_getfile(SCARG(uap, fd))) == NULL)
- return (EBADF);
+ if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
+ return error;
if ((fp->f_flag & (FREAD | FWRITE)) == 0) {
error = EBADF;
Index: src/sys/compat/sunos/sunos_ioctl.c
diff -u src/sys/compat/sunos/sunos_ioctl.c:1.61 src/sys/compat/sunos/sunos_ioctl.c:1.62
--- src/sys/compat/sunos/sunos_ioctl.c:1.61 Wed Nov 19 18:36:05 2008
+++ src/sys/compat/sunos/sunos_ioctl.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_ioctl.c,v 1.61 2008/11/19 18:36:05 ad Exp $ */
+/* $NetBSD: sunos_ioctl.c,v 1.62 2014/09/05 09:21:55 matt Exp $ */
/*
* Copyright (c) 1993 Markus Wild.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.61 2008/11/19 18:36:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.62 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -513,11 +513,12 @@ sunos_sys_ioctl(struct lwp *l, const str
* is on a pty.
*/
int pgrp;
- struct vnode *vp;
+ struct vnode *vp = NULL;
error = (*ctl)(fp, TIOCGPGRP, &pgrp);
if (error) {
- vp = (struct vnode *)fp->f_data;
+ if (fp->f_type == DTYPE_VNODE)
+ vp = fp->f_vnode;
if ((error == EIO || (error == 0 && pgrp == 0)) &&
vp != NULL &&
vp->v_type == VCHR &&
Index: src/sys/compat/sunos/sunos_misc.c
diff -u src/sys/compat/sunos/sunos_misc.c:1.168 src/sys/compat/sunos/sunos_misc.c:1.169
--- src/sys/compat/sunos/sunos_misc.c:1.168 Thu Jun 24 13:03:07 2010
+++ src/sys/compat/sunos/sunos_misc.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_misc.c,v 1.168 2010/06/24 13:03:07 hannken Exp $ */
+/* $NetBSD: sunos_misc.c,v 1.169 2014/09/05 09:21:55 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.168 2010/06/24 13:03:07 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.169 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -377,7 +377,7 @@ sunos_sys_getdents(struct lwp *l, const
goto out1;
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
@@ -814,7 +814,7 @@ sunos_sys_fstatfs(struct lwp *l, const s
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
- mp = ((struct vnode *)fp->f_data)->v_mount;
+ mp = fp->f_vnode->v_mount;
sp = &mp->mnt_stat;
if ((error = VFS_STATVFS(mp, sp)) != 0)
goto out;
Index: src/sys/compat/sunos32/sunos32_ioctl.c
diff -u src/sys/compat/sunos32/sunos32_ioctl.c:1.29 src/sys/compat/sunos32/sunos32_ioctl.c:1.30
--- src/sys/compat/sunos32/sunos32_ioctl.c:1.29 Thu May 29 14:51:26 2008
+++ src/sys/compat/sunos32/sunos32_ioctl.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_ioctl.c,v 1.29 2008/05/29 14:51:26 mrg Exp $ */
+/* $NetBSD: sunos32_ioctl.c,v 1.30 2014/09/05 09:21:55 matt Exp $ */
/* from: NetBSD: sunos_ioctl.c,v 1.35 2001/02/03 22:20:02 mrg Exp */
/*
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_ioctl.c,v 1.29 2008/05/29 14:51:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_ioctl.c,v 1.30 2014/09/05 09:21:55 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd32.h"
@@ -435,15 +435,15 @@ sunos32_do_ioctl(int fd, int cmd, void *
struct vnode *vp;
int error;
- if ((fp = fd_getfile(fd)) == NULL)
- return EBADF;
+ if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
+ return error;
if ((fp->f_flag & (FREAD|FWRITE)) == 0) {
fd_putfile(fd);
return EBADF;
}
error = fp->f_ops->fo_ioctl(fp, cmd, arg);
if (error == EIO && cmd == TIOCGPGRP) {
- vp = (struct vnode *)fp->f_data;
+ vp = fp->f_vnode;
if (vp != NULL && vp->v_type == VCHR && major(vp->v_rdev) == 21)
error = ENOTTY;
}
Index: src/sys/compat/sunos32/sunos32_misc.c
diff -u src/sys/compat/sunos32/sunos32_misc.c:1.74 src/sys/compat/sunos32/sunos32_misc.c:1.75
--- src/sys/compat/sunos32/sunos32_misc.c:1.74 Sun Feb 12 16:34:11 2012
+++ src/sys/compat/sunos32/sunos32_misc.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_misc.c,v 1.74 2012/02/12 16:34:11 matt Exp $ */
+/* $NetBSD: sunos32_misc.c,v 1.75 2014/09/05 09:21:55 matt Exp $ */
/* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp */
/*
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.74 2012/02/12 16:34:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.75 2014/09/05 09:21:55 matt Exp $");
#define COMPAT_SUNOS 1
@@ -622,7 +622,7 @@ sunos32_sys_getdents(struct lwp *l, cons
goto out1;
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
@@ -1116,7 +1116,7 @@ sunos32_sys_fstatfs(struct lwp *l, const
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
- mp = ((struct vnode *)fp->f_data)->v_mount;
+ mp = fp->f_vnode->v_mount;
sp = &mp->mnt_stat;
if ((error = VFS_STATVFS(mp, sp)) != 0)
goto out;
Index: src/sys/compat/svr4/svr4_fcntl.c
diff -u src/sys/compat/svr4/svr4_fcntl.c:1.71 src/sys/compat/svr4/svr4_fcntl.c:1.72
--- src/sys/compat/svr4/svr4_fcntl.c:1.71 Fri Oct 14 09:23:29 2011
+++ src/sys/compat/svr4/svr4_fcntl.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_fcntl.c,v 1.71 2011/10/14 09:23:29 hannken Exp $ */
+/* $NetBSD: svr4_fcntl.c,v 1.72 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1994, 1997, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_fcntl.c,v 1.71 2011/10/14 09:23:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_fcntl.c,v 1.72 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -220,22 +220,16 @@ fd_revoke(struct lwp *l, int fd, registe
vnode_t *vp;
int error;
- if ((fp = fd_getfile(fd)) == NULL)
- return EBADF;
-
- if (fp->f_type != DTYPE_VNODE) {
- fd_putfile(fd);
- return EINVAL;
- }
+ if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
+ return error;
- vp = (vnode_t *) fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VCHR && vp->v_type != VBLK) {
error = EINVAL;
- goto out;
+ } else {
+ error = dorevoke(vp, l->l_cred);
}
- error = dorevoke(vp, l->l_cred);
-out:
vrele(vp);
fd_putfile(fd);
return error;
@@ -258,7 +252,7 @@ fd_truncate(struct lwp *l, int fd, struc
if ((fp = fd_getfile(fd)) == NULL)
return EBADF;
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
fd_putfile(fd);
return ESPIPE;
Index: src/sys/compat/svr4/svr4_misc.c
diff -u src/sys/compat/svr4/svr4_misc.c:1.155 src/sys/compat/svr4/svr4_misc.c:1.156
--- src/sys/compat/svr4/svr4_misc.c:1.155 Tue Sep 27 00:52:55 2011
+++ src/sys/compat/svr4/svr4_misc.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_misc.c,v 1.155 2011/09/27 00:52:55 christos Exp $ */
+/* $NetBSD: svr4_misc.c,v 1.156 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.155 2011/09/27 00:52:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.156 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,7 +227,7 @@ svr4_sys_getdents64(struct lwp *l, const
goto out1;
}
- vp = (struct vnode *)fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
@@ -351,7 +351,7 @@ svr4_sys_getdents(struct lwp *l, const s
goto out1;
}
- vp = (struct vnode *)fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
Index: src/sys/compat/svr4/svr4_net.c
diff -u src/sys/compat/svr4/svr4_net.c:1.60 src/sys/compat/svr4/svr4_net.c:1.61
--- src/sys/compat/svr4/svr4_net.c:1.60 Fri Jul 25 08:10:35 2014
+++ src/sys/compat/svr4/svr4_net.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_net.c,v 1.60 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: svr4_net.c,v 1.61 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1994, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_net.c,v 1.60 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_net.c,v 1.61 2014/09/05 09:21:55 matt Exp $");
#define COMPAT_SVR4 1
@@ -218,7 +218,7 @@ svr4_netopen(dev_t dev, int flag, int mo
int
svr4_soo_close(file_t *fp)
{
- struct socket *so = fp->f_data;
+ struct socket *so = fp->f_socket;
svr4_delete_socket(curproc, fp);
free(so->so_internal, M_NETADDR);
@@ -235,7 +235,7 @@ svr4_stream_get(file_t *fp)
if (fp == NULL || fp->f_type != DTYPE_SOCKET)
return NULL;
- so = fp->f_data;
+ so = fp->f_socket;
if (so->so_internal)
return so->so_internal;
Index: src/sys/compat/svr4/svr4_socket.c
diff -u src/sys/compat/svr4/svr4_socket.c:1.22 src/sys/compat/svr4/svr4_socket.c:1.23
--- src/sys/compat/svr4/svr4_socket.c:1.22 Sun Jan 11 10:51:08 2009
+++ src/sys/compat/svr4/svr4_socket.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_socket.c,v 1.22 2009/01/11 10:51:08 cegger Exp $ */
+/* $NetBSD: svr4_socket.c,v 1.23 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1996, 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_socket.c,v 1.22 2009/01/11 10:51:08 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_socket.c,v 1.23 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -82,7 +82,7 @@ struct sockaddr_un *
svr4_find_socket(struct proc *p, struct file *fp, dev_t dev, svr4_ino_t ino)
{
struct svr4_sockcache_entry *e;
- void *cookie = ((struct socket *) fp->f_data)->so_internal;
+ void *cookie = fp->f_socket->so_internal;
if (!initialized) {
DPRINTF(("svr4_find_socket: uninitialized [%p,%"PRId64",%lu]\n",
@@ -114,7 +114,7 @@ void
svr4_delete_socket(struct proc *p, struct file *fp)
{
struct svr4_sockcache_entry *e;
- void *cookie = ((struct socket *) fp->f_data)->so_internal;
+ void *cookie = fp->f_socket->so_internal;
KERNEL_LOCK(1, NULL);
Index: src/sys/compat/svr4/svr4_stream.c
diff -u src/sys/compat/svr4/svr4_stream.c:1.80 src/sys/compat/svr4/svr4_stream.c:1.81
--- src/sys/compat/svr4/svr4_stream.c:1.80 Wed Jul 9 04:54:03 2014
+++ src/sys/compat/svr4/svr4_stream.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_stream.c,v 1.80 2014/07/09 04:54:03 rtr Exp $ */
+/* $NetBSD: svr4_stream.c,v 1.81 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.80 2014/07/09 04:54:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.81 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -413,7 +413,7 @@ static void
getparm(file_t *fp, struct svr4_si_sockparms *pa)
{
struct svr4_strm *st = svr4_stream_get(fp);
- struct socket *so = (struct socket *) fp->f_data;
+ struct socket *so = fp->f_socket;
if (st == NULL)
return;
Index: src/sys/compat/svr4_32/svr4_32_fcntl.c
diff -u src/sys/compat/svr4_32/svr4_32_fcntl.c:1.35 src/sys/compat/svr4_32/svr4_32_fcntl.c:1.36
--- src/sys/compat/svr4_32/svr4_32_fcntl.c:1.35 Fri Oct 14 09:23:29 2011
+++ src/sys/compat/svr4_32/svr4_32_fcntl.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_fcntl.c,v 1.35 2011/10/14 09:23:29 hannken Exp $ */
+/* $NetBSD: svr4_32_fcntl.c,v 1.36 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1994, 1997, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_fcntl.c,v 1.35 2011/10/14 09:23:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_fcntl.c,v 1.36 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -228,7 +228,7 @@ fd_revoke(struct lwp *l, int fd, registe
return EINVAL;
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VCHR && vp->v_type != VBLK) {
error = EINVAL;
goto out;
@@ -256,7 +256,7 @@ fd_truncate(struct lwp *l, int fd, struc
*/
if ((fp = fd_getfile(fd)) == NULL)
return EBADF;
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
fd_putfile(fd);
return ESPIPE;
Index: src/sys/compat/svr4_32/svr4_32_misc.c
diff -u src/sys/compat/svr4_32/svr4_32_misc.c:1.74 src/sys/compat/svr4_32/svr4_32_misc.c:1.75
--- src/sys/compat/svr4_32/svr4_32_misc.c:1.74 Tue Sep 27 00:56:14 2011
+++ src/sys/compat/svr4_32/svr4_32_misc.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_misc.c,v 1.74 2011/09/27 00:56:14 christos Exp $ */
+/* $NetBSD: svr4_32_misc.c,v 1.75 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.74 2011/09/27 00:56:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.75 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,7 +226,7 @@ svr4_32_sys_getdents64(struct lwp *l, co
goto out1;
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
@@ -350,7 +350,7 @@ svr4_32_sys_getdents(struct lwp *l, cons
goto out1;
}
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (vp->v_type != VDIR) {
error = EINVAL;
goto out1;
Index: src/sys/compat/svr4_32/svr4_32_net.c
diff -u src/sys/compat/svr4_32/svr4_32_net.c:1.21 src/sys/compat/svr4_32/svr4_32_net.c:1.22
--- src/sys/compat/svr4_32/svr4_32_net.c:1.21 Sun Dec 20 09:36:05 2009
+++ src/sys/compat/svr4_32/svr4_32_net.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_net.c,v 1.21 2009/12/20 09:36:05 dsl Exp $ */
+/* $NetBSD: svr4_32_net.c,v 1.22 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1994, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_net.c,v 1.21 2009/12/20 09:36:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_net.c,v 1.22 2014/09/05 09:21:55 matt Exp $");
#define COMPAT_SVR4 1
@@ -124,7 +124,7 @@ svr4_32_stream_get(file_t *fp)
if (fp == NULL || fp->f_type != DTYPE_SOCKET)
return NULL;
- so = (struct socket *) fp->f_data;
+ so = fp->f_socket;
if (so->so_internal)
return so->so_internal;
Index: src/sys/compat/svr4_32/svr4_32_socket.c
diff -u src/sys/compat/svr4_32/svr4_32_socket.c:1.12 src/sys/compat/svr4_32/svr4_32_socket.c:1.13
--- src/sys/compat/svr4_32/svr4_32_socket.c:1.12 Mon Apr 28 20:23:46 2008
+++ src/sys/compat/svr4_32/svr4_32_socket.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_socket.c,v 1.12 2008/04/28 20:23:46 martin Exp $ */
+/* $NetBSD: svr4_32_socket.c,v 1.13 2014/09/05 09:21:55 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_socket.c,v 1.12 2008/04/28 20:23:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_socket.c,v 1.13 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -82,7 +82,7 @@ struct sockaddr_un *
svr4_32_find_socket(struct proc *p, struct file *fp, dev_t dev, svr4_ino_t ino)
{
struct svr4_sockcache_entry *e;
- void *cookie = ((struct socket *) fp->f_data)->so_internal;
+ void *cookie = fp->f_socekt->so_internal;
if (!initialized) {
DPRINTF(("svr4_32_find_socket: uninitialized [%p,%d,%d]\n",
@@ -115,7 +115,7 @@ void
svr4_32_delete_socket(struct proc *p, struct file *fp)
{
struct svr4_sockcache_entry *e;
- void *cookie = ((struct socket *) fp->f_data)->so_internal;
+ void *cookie = fp->f_socket->so_internal;
if (!initialized) {
TAILQ_INIT(&svr4_head);
Index: src/sys/compat/ultrix/ultrix_pathname.c
diff -u src/sys/compat/ultrix/ultrix_pathname.c:1.38 src/sys/compat/ultrix/ultrix_pathname.c:1.39
--- src/sys/compat/ultrix/ultrix_pathname.c:1.38 Mon Dec 14 00:47:12 2009
+++ src/sys/compat/ultrix/ultrix_pathname.c Fri Sep 5 09:21:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_pathname.c,v 1.38 2009/12/14 00:47:12 matt Exp $ */
+/* $NetBSD: ultrix_pathname.c,v 1.39 2014/09/05 09:21:55 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_pathname.c,v 1.38 2009/12/14 00:47:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_pathname.c,v 1.39 2014/09/05 09:21:55 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -264,7 +264,7 @@ ultrix_sys_fstatfs(struct lwp *l, const
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return error;
- mp = ((struct vnode *)fp->f_data)->v_mount;
+ mp = fp->f_vnode->v_mount;
sp = &mp->mnt_stat;
if ((error = VFS_STATVFS(mp, sp)) != 0)
goto out;
