diff options
Diffstat (limited to 'usr/src/uts/common/fs/ctfs/ctfs_root.c')
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_root.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/usr/src/uts/common/fs/ctfs/ctfs_root.c b/usr/src/uts/common/fs/ctfs/ctfs_root.c index 92f0e9027d..1616a986cd 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_root.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_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. */ @@ -32,6 +31,7 @@ #include <sys/time.h> #include <sys/cred.h> #include <sys/vfs.h> +#include <sys/vfs_opreg.h> #include <sys/gfs.h> #include <sys/vnode.h> #include <sys/systm.h> @@ -364,10 +364,10 @@ ctfs_statvfs(vfs_t *vfsp, statvfs64_t *sp) } static const fs_operation_def_t ctfs_vfstops[] = { - { VFSNAME_MOUNT, ctfs_mount }, - { VFSNAME_UNMOUNT, ctfs_unmount }, - { VFSNAME_ROOT, ctfs_root }, - { VFSNAME_STATVFS, ctfs_statvfs }, + { VFSNAME_MOUNT, { .vfs_mount = ctfs_mount } }, + { VFSNAME_UNMOUNT, { .vfs_unmount = ctfs_unmount } }, + { VFSNAME_ROOT, { .vfs_root = ctfs_root } }, + { VFSNAME_STATVFS, { .vfs_statvfs = ctfs_statvfs } }, { NULL, NULL } }; @@ -485,14 +485,14 @@ ctfs_root_do_inode(vnode_t *vp, int index) } static const fs_operation_def_t ctfs_tops_root[] = { - { VOPNAME_OPEN, ctfs_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, fs_inval }, - { VOPNAME_GETATTR, ctfs_root_getattr }, - { VOPNAME_ACCESS, ctfs_access_dir }, - { 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 = ctfs_open } }, + { VOPNAME_CLOSE, { .vop_close = ctfs_close } }, + { VOPNAME_IOCTL, { .error = fs_inval } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_root_getattr } }, + { VOPNAME_ACCESS, { .vop_access = ctfs_access_dir } }, + { 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, NULL } }; |