PSARC/2007/124 Strong Type-Checking for VFS Operation Registration Mechanism

6505923 Need better type checking for vnodeops
6531594 lxpr_readlink() is missing the "cred_t *cr" arg
6532559 vfs_strayops does not use the vnode/vfs operation registration mechanism

2 files changed, 17 insertions, 16 deletions

diff --git a/usr/src/uts/common/fs/swapfs/swap_subr.c b/usr/src/uts/common/fs/swapfs/swap_subr.c
index df175211c6..e589c38073 100644
--- a/usr/src/uts/common/fs/swapfs/swap_subr.c
+++ b/usr/src/uts/common/fs/swapfs/swap_subr.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,6 +31,7 @@
 #include <sys/errno.h>
 #include <sys/kmem.h>
 #include <sys/vnode.h>
+#include <sys/vfs_opreg.h>
 #include <sys/swap.h>
 #include <sys/sysmacros.h>
 #include <sys/buf.h>
@@ -167,7 +167,7 @@ swapinit(int fstype, char *name)
 	int i, error;
 
 	static const fs_operation_def_t swap_vfsops[] = {
-		VFSNAME_SYNC, (fs_generic_func_p) swap_sync,
+		VFSNAME_SYNC, { .vfs_sync = swap_sync },
 		NULL, NULL
 	};
 
diff --git a/usr/src/uts/common/fs/swapfs/swap_vnops.c b/usr/src/uts/common/fs/swapfs/swap_vnops.c
index bdcf5b8ca2..53bdae350c 100644
--- a/usr/src/uts/common/fs/swapfs/swap_vnops.c
+++ b/usr/src/uts/common/fs/swapfs/swap_vnops.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,6 +32,7 @@
 #include <sys/cred.h>
 #include <sys/errno.h>
 #include <sys/vnode.h>
+#include <sys/vfs_opreg.h>
 #include <sys/cmn_err.h>
 #include <sys/swap.h>
 #include <sys/mman.h>
@@ -75,16 +76,16 @@ static int 	swap_putapage(struct vnode *vp, page_t *pp, u_offset_t *off,
     size_t *lenp, int flags, struct cred *cr);
 
 const fs_operation_def_t swap_vnodeops_template[] = {
-	VOPNAME_INACTIVE, (fs_generic_func_p) swap_inactive,
-	VOPNAME_GETPAGE, swap_getpage,
-	VOPNAME_PUTPAGE, swap_putpage,
-	VOPNAME_DISPOSE, (fs_generic_func_p) swap_dispose,
-	VOPNAME_SETFL, fs_error,
-	VOPNAME_POLL, fs_error,
-	VOPNAME_PATHCONF, fs_error,
-	VOPNAME_GETSECATTR, fs_error,
-	VOPNAME_SHRLOCK, fs_error,
-	NULL, NULL
+	VOPNAME_INACTIVE,	{ .vop_inactive = swap_inactive },
+	VOPNAME_GETPAGE,	{ .vop_getpage = swap_getpage },
+	VOPNAME_PUTPAGE,	{ .vop_putpage = swap_putpage },
+	VOPNAME_DISPOSE,	{ .vop_dispose = swap_dispose },
+	VOPNAME_SETFL,		{ .error = fs_error },
+	VOPNAME_POLL,		{ .error = fs_error },
+	VOPNAME_PATHCONF,	{ .error = fs_error },
+	VOPNAME_GETSECATTR,	{ .error = fs_error },
+	VOPNAME_SHRLOCK,	{ .error = fs_error },
+	NULL,			NULL
 };
 
 vnodeops_t *swap_vnodeops;