Module Name: src
Committed By: matt
Date: Fri Sep 5 09:26:16 UTC 2014
Modified Files:
src/sys/fs/union: union_subr.c
src/sys/miscfs/fdesc: fdesc_vnops.c
src/sys/miscfs/procfs: procfs_vfsops.c procfs_vnops.c
src/sys/netsmb: smb_dev.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.66 -r1.67 src/sys/fs/union/union_subr.c
cvs rdiff -u -r1.123 -r1.124 src/sys/miscfs/fdesc/fdesc_vnops.c
cvs rdiff -u -r1.92 -r1.93 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.191 -r1.192 src/sys/miscfs/procfs/procfs_vnops.c
cvs rdiff -u -r1.42 -r1.43 src/sys/netsmb/smb_dev.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/fs/union/union_subr.c
diff -u src/sys/fs/union/union_subr.c:1.66 src/sys/fs/union/union_subr.c:1.67
--- src/sys/fs/union/union_subr.c:1.66 Tue Jun 17 12:38:12 2014
+++ src/sys/fs/union/union_subr.c Fri Sep 5 09:26:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: union_subr.c,v 1.66 2014/06/17 12:38:12 hannken Exp $ */
+/* $NetBSD: union_subr.c,v 1.67 2014/09/05 09:26:16 matt Exp $ */
/*
* Copyright (c) 1994
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.66 2014/06/17 12:38:12 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.67 2014/09/05 09:26:16 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1195,7 +1195,7 @@ union_readdirhook(struct vnode **vpp, st
return (error);
}
VOP_UNLOCK(lvp);
- fp->f_data = lvp;
+ fp->f_vnode = lvp;
fp->f_offset = 0;
error = vn_close(vp, FREAD, fp->f_cred);
if (error)
Index: src/sys/miscfs/fdesc/fdesc_vnops.c
diff -u src/sys/miscfs/fdesc/fdesc_vnops.c:1.123 src/sys/miscfs/fdesc/fdesc_vnops.c:1.124
--- src/sys/miscfs/fdesc/fdesc_vnops.c:1.123 Thu Sep 4 13:29:50 2014
+++ src/sys/miscfs/fdesc/fdesc_vnops.c Fri Sep 5 09:26:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vnops.c,v 1.123 2014/09/04 13:29:50 christos Exp $ */
+/* $NetBSD: fdesc_vnops.c,v 1.124 2014/09/05 09:26:16 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.123 2014/09/04 13:29:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.124 2014/09/05 09:26:16 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -344,9 +344,9 @@ fdesc_attr(int fd, struct vattr *vap, ka
switch (fp->f_type) {
case DTYPE_VNODE:
- vn_lock((struct vnode *) fp->f_data, LK_SHARED | LK_RETRY);
- error = VOP_GETATTR((struct vnode *) fp->f_data, vap, cred);
- VOP_UNLOCK((struct vnode *) fp->f_data);
+ vn_lock(fp->f_vnode, LK_SHARED | LK_RETRY);
+ error = VOP_GETATTR(fp->f_vnode, vap, cred);
+ VOP_UNLOCK(fp->f_vnode);
if (error == 0 && vap->va_type == VDIR) {
/*
* directories can cause loops in the namespace,
Index: src/sys/miscfs/procfs/procfs_vfsops.c
diff -u src/sys/miscfs/procfs/procfs_vfsops.c:1.92 src/sys/miscfs/procfs/procfs_vfsops.c:1.93
--- src/sys/miscfs/procfs/procfs_vfsops.c:1.92 Sun Jul 27 16:47:26 2014
+++ src/sys/miscfs/procfs/procfs_vfsops.c Fri Sep 5 09:26:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vfsops.c,v 1.92 2014/07/27 16:47:26 hannken Exp $ */
+/* $NetBSD: procfs_vfsops.c,v 1.93 2014/09/05 09:26:16 matt Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.92 2014/07/27 16:47:26 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.93 2014/09/05 09:26:16 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -339,7 +339,7 @@ procfs_loadvnode(struct mount *mp, struc
pfs->pfs_mode = S_IRUSR|S_IWUSR;
switch (fp->f_type) {
case DTYPE_VNODE:
- vxp = fp->f_data;
+ vxp = fp->f_vnode;
/*
* We make symlinks for directories
Index: src/sys/miscfs/procfs/procfs_vnops.c
diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.191 src/sys/miscfs/procfs/procfs_vnops.c:1.192
--- src/sys/miscfs/procfs/procfs_vnops.c:1.191 Sun Jul 27 16:47:26 2014
+++ src/sys/miscfs/procfs/procfs_vnops.c Fri Sep 5 09:26:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vnops.c,v 1.191 2014/07/27 16:47:26 hannken Exp $ */
+/* $NetBSD: procfs_vnops.c,v 1.192 2014/09/05 09:26:16 matt Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.191 2014/07/27 16:47:26 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.192 2014/09/05 09:26:16 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -821,7 +821,7 @@ procfs_getattr(void *v)
switch (fp->f_type) {
case DTYPE_VNODE:
vap->va_bytes = vap->va_size =
- ((struct vnode *)fp->f_data)->v_size;
+ fp->f_vnode->v_size;
break;
default:
vap->va_bytes = vap->va_size = 0;
@@ -1146,7 +1146,7 @@ procfs_lookup(void *v)
procfs_proc_unlock(p);
return ENOENT;
}
- fvp = fp->f_data;
+ fvp = fp->f_vnode;
/* Don't show directories */
if (fp->f_type == DTYPE_VNODE && fvp->v_type != VDIR) {
@@ -1648,7 +1648,7 @@ procfs_readlink(void *v)
switch (fp->f_type) {
case DTYPE_VNODE:
- vxp = (struct vnode *)fp->f_data;
+ vxp = fp->f_vnode;
if (vxp->v_type != VDIR) {
error = EINVAL;
break;
Index: src/sys/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.42 src/sys/netsmb/smb_dev.c:1.43
--- src/sys/netsmb/smb_dev.c:1.42 Fri Jul 25 08:10:40 2014
+++ src/sys/netsmb/smb_dev.c Fri Sep 5 09:26:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.42 2014/07/25 08:10:40 dholland Exp $ */
+/* $NetBSD: smb_dev.c,v 1.43 2014/09/05 09:26:16 matt Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.42 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.43 2014/09/05 09:26:16 matt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -417,7 +417,7 @@ smb_dev2share(int fd, int mode, struct s
if ((fp = fd_getfile(fd)) == NULL)
return (EBADF);
- vp = fp->f_data;
+ vp = fp->f_vnode;
if (fp->f_type != DTYPE_VNODE
|| (fp->f_flag & (FREAD|FWRITE)) == 0
|| vp->v_type != VCHR
