diff options
Diffstat (limited to 'usr/src/uts/common/fs/ctfs')
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_all.c | 26 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_cdir.c | 26 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_ctl.c | 40 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_event.c | 44 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_latest.c | 24 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_root.c | 34 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_sym.c | 26 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_tdir.c | 26 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/ctfs/ctfs_tmpl.c | 24 |
9 files changed, 135 insertions, 135 deletions
diff --git a/usr/src/uts/common/fs/ctfs/ctfs_all.c b/usr/src/uts/common/fs/ctfs/ctfs_all.c index 4933edd960..382f66da8a 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_all.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_all.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. */ @@ -31,6 +30,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> @@ -135,14 +135,14 @@ ctfs_adir_do_readdir(vnode_t *vp, struct dirent64 *dp, int *eofp, } const fs_operation_def_t ctfs_tops_adir[] = { - { VOPNAME_OPEN, ctfs_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, fs_inval }, - { VOPNAME_GETATTR, ctfs_adir_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_adir_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 } }; diff --git a/usr/src/uts/common/fs/ctfs/ctfs_cdir.c b/usr/src/uts/common/fs/ctfs/ctfs_cdir.c index 0f038b8b13..4861f73244 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_cdir.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_cdir.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. */ @@ -31,6 +30,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> @@ -149,14 +149,14 @@ ctfs_cdir_inactive(vnode_t *vp, cred_t *cr) const fs_operation_def_t ctfs_tops_cdir[] = { - { VOPNAME_OPEN, ctfs_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, fs_inval }, - { VOPNAME_GETATTR, ctfs_cdir_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) ctfs_cdir_inactive }, + { VOPNAME_OPEN, { .vop_open = ctfs_open } }, + { VOPNAME_CLOSE, { .vop_close = ctfs_close } }, + { VOPNAME_IOCTL, { .error = fs_inval } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_cdir_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 = ctfs_cdir_inactive } }, { NULL, NULL } }; diff --git a/usr/src/uts/common/fs/ctfs/ctfs_ctl.c b/usr/src/uts/common/fs/ctfs/ctfs_ctl.c index f4980d4a97..43b5813ff1 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_ctl.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_ctl.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. */ @@ -31,6 +30,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> @@ -183,14 +183,14 @@ ctfs_ctl_ioctl(vnode_t *vp, int cmd, intptr_t arg, int flag, cred_t *cr, } const fs_operation_def_t ctfs_tops_ctl[] = { - { VOPNAME_OPEN, ctfs_ctl_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, ctfs_ctl_ioctl }, - { VOPNAME_GETATTR, ctfs_ctl_getattr }, - { VOPNAME_ACCESS, ctfs_ctl_access }, - { VOPNAME_READDIR, fs_notdir }, - { VOPNAME_LOOKUP, fs_notdir }, - { VOPNAME_INACTIVE, (fs_generic_func_p) gfs_vop_inactive }, + { VOPNAME_OPEN, { .vop_open = ctfs_ctl_open } }, + { VOPNAME_CLOSE, { .vop_close = ctfs_close } }, + { VOPNAME_IOCTL, { .vop_ioctl = ctfs_ctl_ioctl } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_ctl_getattr } }, + { VOPNAME_ACCESS, { .vop_access = ctfs_ctl_access } }, + { VOPNAME_READDIR, { .error = fs_notdir } }, + { VOPNAME_LOOKUP, { .error = fs_notdir } }, + { VOPNAME_INACTIVE, { .vop_inactive = gfs_vop_inactive } }, { NULL, NULL } }; @@ -276,13 +276,13 @@ ctfs_stat_ioctl(vnode_t *vp, int cmd, intptr_t arg, int flag, cred_t *cr, } const fs_operation_def_t ctfs_tops_stat[] = { - { VOPNAME_OPEN, ctfs_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, ctfs_stat_ioctl }, - { VOPNAME_GETATTR, ctfs_ctl_getattr }, - { VOPNAME_ACCESS, ctfs_access_readonly }, - { VOPNAME_READDIR, fs_notdir }, - { VOPNAME_LOOKUP, fs_notdir }, - { VOPNAME_INACTIVE, (fs_generic_func_p) gfs_vop_inactive }, + { VOPNAME_OPEN, { .vop_open = ctfs_open } }, + { VOPNAME_CLOSE, { .vop_close = ctfs_close } }, + { VOPNAME_IOCTL, { .vop_ioctl = ctfs_stat_ioctl } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_ctl_getattr } }, + { VOPNAME_ACCESS, { .vop_access = ctfs_access_readonly } }, + { VOPNAME_READDIR, { .error = fs_notdir } }, + { VOPNAME_LOOKUP, { .error = fs_notdir } }, + { VOPNAME_INACTIVE, { .vop_inactive = gfs_vop_inactive } }, { NULL, NULL } }; diff --git a/usr/src/uts/common/fs/ctfs/ctfs_event.c b/usr/src/uts/common/fs/ctfs/ctfs_event.c index 7fa7cfb608..ac4447e493 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_event.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_event.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. */ @@ -31,6 +30,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> @@ -304,15 +304,15 @@ ctfs_ev_poll(vnode_t *vp, short events, int anyyet, short *reventsp, } const fs_operation_def_t ctfs_tops_event[] = { - { VOPNAME_OPEN, ctfs_ev_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, ctfs_ev_ioctl }, - { VOPNAME_GETATTR, ctfs_ev_getattr }, - { VOPNAME_ACCESS, ctfs_ev_access }, - { VOPNAME_READDIR, fs_notdir }, - { VOPNAME_LOOKUP, fs_notdir }, - { VOPNAME_INACTIVE, (fs_generic_func_p) ctfs_ev_inactive }, - { VOPNAME_POLL, (fs_generic_func_p) ctfs_ev_poll }, + { VOPNAME_OPEN, { .vop_open = ctfs_ev_open } }, + { VOPNAME_CLOSE, { .vop_close = ctfs_close } }, + { VOPNAME_IOCTL, { .vop_ioctl = ctfs_ev_ioctl } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_ev_getattr } }, + { VOPNAME_ACCESS, { .vop_access = ctfs_ev_access } }, + { VOPNAME_READDIR, { .error = fs_notdir } }, + { VOPNAME_LOOKUP, { .error = fs_notdir } }, + { VOPNAME_INACTIVE, { .vop_inactive = ctfs_ev_inactive } }, + { VOPNAME_POLL, { .vop_poll = ctfs_ev_poll } }, { NULL, NULL } }; @@ -447,14 +447,14 @@ ctfs_bu_poll(vnode_t *vp, short events, int anyyet, short *reventsp, } const fs_operation_def_t ctfs_tops_bundle[] = { - { VOPNAME_OPEN, ctfs_bu_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, ctfs_bu_ioctl }, - { VOPNAME_GETATTR, ctfs_bu_getattr }, - { VOPNAME_ACCESS, ctfs_access_readonly }, - { VOPNAME_READDIR, fs_notdir }, - { VOPNAME_LOOKUP, fs_notdir }, - { VOPNAME_INACTIVE, (fs_generic_func_p) ctfs_bu_inactive }, - { VOPNAME_POLL, (fs_generic_func_p) ctfs_bu_poll }, + { VOPNAME_OPEN, { .vop_open = ctfs_bu_open } }, + { VOPNAME_CLOSE, { .vop_close = ctfs_close } }, + { VOPNAME_IOCTL, { .vop_ioctl = ctfs_bu_ioctl } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_bu_getattr } }, + { VOPNAME_ACCESS, { .vop_access = ctfs_access_readonly } }, + { VOPNAME_READDIR, { .error = fs_notdir } }, + { VOPNAME_LOOKUP, { .error = fs_notdir } }, + { VOPNAME_INACTIVE, { .vop_inactive = ctfs_bu_inactive } }, + { VOPNAME_POLL, { .vop_poll = ctfs_bu_poll } }, { NULL, NULL } }; diff --git a/usr/src/uts/common/fs/ctfs/ctfs_latest.c b/usr/src/uts/common/fs/ctfs/ctfs_latest.c index 27ee75917e..7d15dd494a 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_latest.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_latest.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. */ @@ -31,6 +30,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> @@ -162,13 +162,13 @@ ctfs_latest_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr) } const fs_operation_def_t ctfs_tops_latest[] = { - { VOPNAME_OPEN, ctfs_latest_open }, - { VOPNAME_CLOSE, fs_inval }, - { VOPNAME_IOCTL, fs_inval }, - { VOPNAME_GETATTR, ctfs_latest_getattr }, - { VOPNAME_ACCESS, ctfs_latest_access }, - { VOPNAME_READDIR, fs_notdir }, - { VOPNAME_LOOKUP, fs_notdir }, - { VOPNAME_INACTIVE, (fs_generic_func_p) gfs_vop_inactive }, + { VOPNAME_OPEN, { .vop_open = ctfs_latest_open } }, + { VOPNAME_CLOSE, { .error = fs_inval } }, + { VOPNAME_IOCTL, { .error = fs_inval } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_latest_getattr } }, + { VOPNAME_ACCESS, { .vop_access = ctfs_latest_access } }, + { VOPNAME_READDIR, { .error = fs_notdir } }, + { VOPNAME_LOOKUP, { .error = fs_notdir } }, + { VOPNAME_INACTIVE, { .vop_inactive = gfs_vop_inactive } }, { NULL, NULL } }; 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 } }; diff --git a/usr/src/uts/common/fs/ctfs/ctfs_sym.c b/usr/src/uts/common/fs/ctfs/ctfs_sym.c index 14bd5f1694..bf825ab366 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_sym.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_sym.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. */ @@ -31,6 +30,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> @@ -129,14 +129,14 @@ ctfs_sym_inactive(vnode_t *vp, cred_t *cr) } const fs_operation_def_t ctfs_tops_sym[] = { - { VOPNAME_OPEN, ctfs_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, fs_inval }, - { VOPNAME_GETATTR, ctfs_sym_getattr }, - { VOPNAME_READLINK, ctfs_sym_readlink }, - { VOPNAME_ACCESS, ctfs_access_readonly }, - { VOPNAME_READDIR, fs_notdir }, - { VOPNAME_LOOKUP, fs_notdir }, - { VOPNAME_INACTIVE, (fs_generic_func_p) ctfs_sym_inactive }, + { VOPNAME_OPEN, { .vop_open = ctfs_open } }, + { VOPNAME_CLOSE, { .vop_close = ctfs_close } }, + { VOPNAME_IOCTL, { .error = fs_inval } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_sym_getattr } }, + { VOPNAME_READLINK, { .vop_readlink = ctfs_sym_readlink } }, + { VOPNAME_ACCESS, { .vop_access = ctfs_access_readonly } }, + { VOPNAME_READDIR, { .error = fs_notdir } }, + { VOPNAME_LOOKUP, { .error = fs_notdir } }, + { VOPNAME_INACTIVE, { .vop_inactive = ctfs_sym_inactive } }, { NULL, NULL } }; diff --git a/usr/src/uts/common/fs/ctfs/ctfs_tdir.c b/usr/src/uts/common/fs/ctfs/ctfs_tdir.c index 1f5dd42370..2d47c72339 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_tdir.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_tdir.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. */ @@ -31,6 +30,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> @@ -146,14 +146,14 @@ ctfs_tdir_do_lookup(vnode_t *vp, const char *nm, vnode_t **vpp, ino64_t *inop) } const fs_operation_def_t ctfs_tops_tdir[] = { - { VOPNAME_OPEN, ctfs_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, fs_inval }, - { VOPNAME_GETATTR, ctfs_tdir_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_tdir_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 } }; diff --git a/usr/src/uts/common/fs/ctfs/ctfs_tmpl.c b/usr/src/uts/common/fs/ctfs/ctfs_tmpl.c index 329ae49fd9..28d0c93662 100644 --- a/usr/src/uts/common/fs/ctfs/ctfs_tmpl.c +++ b/usr/src/uts/common/fs/ctfs/ctfs_tmpl.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. */ @@ -31,6 +30,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> @@ -164,13 +164,13 @@ ctfs_tmpl_inactive(vnode_t *vp, cred_t *cr) } const fs_operation_def_t ctfs_tops_tmpl[] = { - { VOPNAME_OPEN, ctfs_tmpl_open }, - { VOPNAME_CLOSE, ctfs_close }, - { VOPNAME_IOCTL, ctfs_tmpl_ioctl }, - { VOPNAME_GETATTR, ctfs_tmpl_getattr }, - { VOPNAME_ACCESS, ctfs_access_readwrite }, - { VOPNAME_READDIR, fs_notdir }, - { VOPNAME_LOOKUP, fs_notdir }, - { VOPNAME_INACTIVE, (fs_generic_func_p) ctfs_tmpl_inactive }, + { VOPNAME_OPEN, { .vop_open = ctfs_tmpl_open } }, + { VOPNAME_CLOSE, { .vop_close = ctfs_close } }, + { VOPNAME_IOCTL, { .vop_ioctl = ctfs_tmpl_ioctl } }, + { VOPNAME_GETATTR, { .vop_getattr = ctfs_tmpl_getattr } }, + { VOPNAME_ACCESS, { .vop_access = ctfs_access_readwrite } }, + { VOPNAME_READDIR, { .error = fs_notdir } }, + { VOPNAME_LOOKUP, { .error = fs_notdir } }, + { VOPNAME_INACTIVE, { .vop_inactive = ctfs_tmpl_inactive } }, { NULL, NULL } }; |