summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/objfs
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common/fs/objfs')
-rw-r--r--usr/src/uts/common/fs/objfs/objfs_data.c26
-rw-r--r--usr/src/uts/common/fs/objfs/objfs_odir.c26
-rw-r--r--usr/src/uts/common/fs/objfs/objfs_root.c26
-rw-r--r--usr/src/uts/common/fs/objfs/objfs_vfs.c16
4 files changed, 47 insertions, 47 deletions
diff --git a/usr/src/uts/common/fs/objfs/objfs_data.c b/usr/src/uts/common/fs/objfs/objfs_data.c
index 8f26850a47..4e050112fb 100644
--- a/usr/src/uts/common/fs/objfs/objfs_data.c
+++ b/usr/src/uts/common/fs/objfs/objfs_data.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.
*/
@@ -38,6 +37,7 @@
#include <sys/stat.h>
#include <sys/systm.h>
#include <sys/sysmacros.h>
+#include <sys/vfs_opreg.h>
/*
* /system/object/<obj>/object
@@ -751,14 +751,14 @@ objfs_data_seek(vnode_t *vp, offset_t off, offset_t *offp)
}
const fs_operation_def_t objfs_tops_data[] = {
- { VOPNAME_OPEN, objfs_data_open },
- { VOPNAME_CLOSE, objfs_common_close },
- { VOPNAME_IOCTL, fs_inval },
- { VOPNAME_GETATTR, objfs_data_getattr },
- { VOPNAME_ACCESS, objfs_data_access },
- { VOPNAME_INACTIVE, (fs_generic_func_p) gfs_vop_inactive },
- { VOPNAME_READ, objfs_data_read },
- { VOPNAME_SEEK, objfs_data_seek },
- { VOPNAME_MAP, (fs_generic_func_p) gfs_vop_map },
+ { VOPNAME_OPEN, { .vop_open = objfs_data_open } },
+ { VOPNAME_CLOSE, { .vop_close = objfs_common_close } },
+ { VOPNAME_IOCTL, { .error = fs_inval } },
+ { VOPNAME_GETATTR, { .vop_getattr = objfs_data_getattr } },
+ { VOPNAME_ACCESS, { .vop_access = objfs_data_access } },
+ { VOPNAME_INACTIVE, { .vop_inactive = gfs_vop_inactive } },
+ { VOPNAME_READ, { .vop_read = objfs_data_read } },
+ { VOPNAME_SEEK, { .vop_seek = objfs_data_seek } },
+ { VOPNAME_MAP, { .vop_map = gfs_vop_map } },
{ NULL }
};
diff --git a/usr/src/uts/common/fs/objfs/objfs_odir.c b/usr/src/uts/common/fs/objfs/objfs_odir.c
index 500957933a..a7ef0ed502 100644
--- a/usr/src/uts/common/fs/objfs/objfs_odir.c
+++ b/usr/src/uts/common/fs/objfs/objfs_odir.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/modctl.h>
#include <sys/objfs.h>
#include <sys/objfs_impl.h>
+#include <sys/vfs_opreg.h>
#include <sys/stat.h>
static gfs_dirent_t objfs_odir_entries[] = {
@@ -78,14 +78,14 @@ objfs_odir_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr)
}
const fs_operation_def_t objfs_tops_odir[] = {
- { VOPNAME_OPEN, objfs_dir_open },
- { VOPNAME_CLOSE, objfs_common_close },
- { VOPNAME_IOCTL, fs_inval },
- { VOPNAME_GETATTR, objfs_odir_getattr },
- { VOPNAME_ACCESS, objfs_dir_access },
- { VOPNAME_READDIR, gfs_vop_readdir },
- { VOPNAME_LOOKUP, gfs_vop_lookup },
- { VOPNAME_SEEK, fs_seek },
- { VOPNAME_INACTIVE, (fs_generic_func_p) gfs_vop_inactive },
+ { VOPNAME_OPEN, { .vop_open = objfs_dir_open } },
+ { VOPNAME_CLOSE, { .vop_close = objfs_common_close } },
+ { VOPNAME_IOCTL, { .error = fs_inval } },
+ { VOPNAME_GETATTR, { .vop_getattr = objfs_odir_getattr } },
+ { VOPNAME_ACCESS, { .vop_access = objfs_dir_access } },
+ { VOPNAME_READDIR, { .vop_readdir = gfs_vop_readdir } },
+ { VOPNAME_LOOKUP, { .vop_lookup = gfs_vop_lookup } },
+ { VOPNAME_SEEK, { .vop_seek = fs_seek } },
+ { VOPNAME_INACTIVE, { .vop_inactive = gfs_vop_inactive } },
{ NULL }
};
diff --git a/usr/src/uts/common/fs/objfs/objfs_root.c b/usr/src/uts/common/fs/objfs/objfs_root.c
index 5c83f1e8dc..1e9bb8c1f0 100644
--- a/usr/src/uts/common/fs/objfs/objfs_root.c
+++ b/usr/src/uts/common/fs/objfs/objfs_root.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.
*/
@@ -34,6 +33,7 @@
#include <sys/modctl.h>
#include <sys/objfs.h>
#include <sys/objfs_impl.h>
+#include <sys/vfs_opreg.h>
#include <sys/systm.h>
extern int last_module_id;
@@ -156,14 +156,14 @@ objfs_root_readdir(vnode_t *vp, uio_t *uiop, cred_t *cr, int *eofp)
}
const fs_operation_def_t objfs_tops_root[] = {
- { VOPNAME_OPEN, objfs_dir_open },
- { VOPNAME_CLOSE, objfs_common_close },
- { VOPNAME_IOCTL, fs_inval },
- { VOPNAME_GETATTR, objfs_root_getattr },
- { VOPNAME_ACCESS, objfs_dir_access },
- { VOPNAME_READDIR, objfs_root_readdir },
- { VOPNAME_LOOKUP, gfs_vop_lookup },
- { VOPNAME_SEEK, fs_seek },
- { VOPNAME_INACTIVE, (fs_generic_func_p)gfs_vop_inactive },
+ { VOPNAME_OPEN, { .vop_open = objfs_dir_open } },
+ { VOPNAME_CLOSE, { .vop_close = objfs_common_close } },
+ { VOPNAME_IOCTL, { .error = fs_inval } },
+ { VOPNAME_GETATTR, { .vop_getattr = objfs_root_getattr } },
+ { VOPNAME_ACCESS, { .vop_access = objfs_dir_access } },
+ { VOPNAME_READDIR, { .vop_readdir = objfs_root_readdir } },
+ { VOPNAME_LOOKUP, { .vop_lookup = gfs_vop_lookup } },
+ { VOPNAME_SEEK, { .vop_seek = fs_seek } },
+ { VOPNAME_INACTIVE, { .vop_inactive = gfs_vop_inactive } },
{ NULL }
};
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 }
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-02 19:51:42 +0000