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

1 files changed, 10 insertions, 10 deletions

diff --git a/usr/src/uts/common/fs/cachefs/cachefs_vfsops.c b/usr/src/uts/common/fs/cachefs/cachefs_vfsops.c
index 81be82c033..fd1ee0b4d8 100644
--- a/usr/src/uts/common/fs/cachefs/cachefs_vfsops.c
+++ b/usr/src/uts/common/fs/cachefs/cachefs_vfsops.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.
  */
 
@@ -33,6 +32,7 @@
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
 #include <sys/vnode.h>
 #include <sys/pathname.h>
 #include <sys/uio.h>
@@ -98,12 +98,12 @@ int
 cachefs_init_vfsops(int fstype)
 {
 	static const fs_operation_def_t cachefs_vfsops_template[] = {
-		VFSNAME_MOUNT, cachefs_mount,
-		VFSNAME_UNMOUNT, cachefs_unmount,
-		VFSNAME_ROOT, cachefs_root,
-		VFSNAME_STATVFS, cachefs_statvfs,
-		VFSNAME_SYNC, (fs_generic_func_p) cachefs_sync,
-		NULL, NULL
+		VFSNAME_MOUNT,		{ .vfs_mount = cachefs_mount },
+		VFSNAME_UNMOUNT,	{ .vfs_unmount = cachefs_unmount },
+		VFSNAME_ROOT,		{ .vfs_root = cachefs_root },
+		VFSNAME_STATVFS,	{ .vfs_statvfs = cachefs_statvfs },
+		VFSNAME_SYNC,		{ .vfs_sync = cachefs_sync },
+		NULL,			NULL
 	};
 	int error;