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, 8 insertions, 8 deletions

diff --git a/usr/src/uts/common/fs/objfs/objfs_vfs.c b/usr/src/uts/common/fs/objfs/objfs_vfs.c
index 77f5b6a5ef..0ee0b0a577 100644
--- a/usr/src/uts/common/fs/objfs/objfs_vfs.c
+++ b/usr/src/uts/common/fs/objfs/objfs_vfs.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 2004 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/mount.h>
 #include <sys/objfs.h>
 #include <sys/objfs_impl.h>
+#include <sys/vfs_opreg.h>
 #include <sys/policy.h>
 #include <sys/sunddi.h>
 #include <sys/sysmacros.h>
@@ -267,9 +267,9 @@ objfs_statvfs(vfs_t *vfsp, statvfs64_t *sp)
 }
 
 static const fs_operation_def_t objfs_vfstops[] = {
-	{ VFSNAME_MOUNT,	objfs_mount },
-	{ VFSNAME_UNMOUNT,	objfs_unmount },
-	{ VFSNAME_ROOT,		objfs_root },
-	{ VFSNAME_STATVFS,	objfs_statvfs },
+	{ VFSNAME_MOUNT,	{ .vfs_mount = objfs_mount } },
+	{ VFSNAME_UNMOUNT,	{ .vfs_unmount = objfs_unmount } },
+	{ VFSNAME_ROOT,		{ .vfs_root = objfs_root } },
+	{ VFSNAME_STATVFS,	{ .vfs_statvfs = objfs_statvfs } },
 	{ NULL }
 };