summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/sockfs
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common/fs/sockfs')
-rw-r--r--usr/src/uts/common/fs/sockfs/socksctp.c1
-rw-r--r--usr/src/uts/common/fs/sockfs/socksctpsubr.c3
-rw-r--r--usr/src/uts/common/fs/sockfs/socksctpvnops.c33
-rwxr-xr-xusr/src/uts/common/fs/sockfs/socksdp.c1
-rwxr-xr-xusr/src/uts/common/fs/sockfs/socksdpsubr.c1
-rwxr-xr-xusr/src/uts/common/fs/sockfs/socksdpvnops.c33
-rw-r--r--usr/src/uts/common/fs/sockfs/socksubr.c1
-rw-r--r--usr/src/uts/common/fs/sockfs/sockvnops.c35
8 files changed, 58 insertions, 50 deletions
diff --git a/usr/src/uts/common/fs/sockfs/socksctp.c b/usr/src/uts/common/fs/sockfs/socksctp.c
index 4a8b57b2da..d50f143523 100644
--- a/usr/src/uts/common/fs/sockfs/socksctp.c
+++ b/usr/src/uts/common/fs/sockfs/socksctp.c
@@ -32,6 +32,7 @@
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
#include <sys/vnode.h>
#include <sys/debug.h>
#include <sys/errno.h>
diff --git a/usr/src/uts/common/fs/sockfs/socksctpsubr.c b/usr/src/uts/common/fs/sockfs/socksctpsubr.c
index c0f492fb61..11da6b7b1d 100644
--- a/usr/src/uts/common/fs/sockfs/socksctpsubr.c
+++ b/usr/src/uts/common/fs/sockfs/socksctpsubr.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -37,6 +37,7 @@
#include <sys/sysmacros.h>
#include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
diff --git a/usr/src/uts/common/fs/sockfs/socksctpvnops.c b/usr/src/uts/common/fs/sockfs/socksctpvnops.c
index 0adb375b15..ea3c49ce6e 100644
--- a/usr/src/uts/common/fs/sockfs/socksctpvnops.c
+++ b/usr/src/uts/common/fs/sockfs/socksctpvnops.c
@@ -35,6 +35,7 @@
#include <sys/errno.h>
#include <sys/uio.h>
#include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
#include <sys/vnode.h>
#include <sys/stropts.h>
#include <sys/cmn_err.h>
@@ -78,22 +79,22 @@ static int socksctpv_poll(struct vnode *, short, int, short *,
struct pollhead **);
const fs_operation_def_t socksctp_vnodeops_template[] = {
- VOPNAME_OPEN, socksctpv_open,
- VOPNAME_CLOSE, socksctpv_close,
- VOPNAME_READ, socksctpv_read,
- VOPNAME_WRITE, socksctpv_write,
- VOPNAME_IOCTL, socksctpv_ioctl,
- VOPNAME_SETFL, socksctp_setfl,
- VOPNAME_GETATTR, socktpi_getattr,
- VOPNAME_SETATTR, socktpi_setattr,
- VOPNAME_ACCESS, socktpi_access,
- VOPNAME_FSYNC, socktpi_fsync,
- VOPNAME_INACTIVE, (fs_generic_func_p) socksctpv_inactive,
- VOPNAME_FID, socktpi_fid,
- VOPNAME_SEEK, socktpi_seek,
- VOPNAME_POLL, (fs_generic_func_p) socksctpv_poll,
- VOPNAME_DISPOSE, fs_error,
- NULL, NULL
+ VOPNAME_OPEN, { .vop_open = socksctpv_open },
+ VOPNAME_CLOSE, { .vop_close = socksctpv_close },
+ VOPNAME_READ, { .vop_read = socksctpv_read },
+ VOPNAME_WRITE, { .vop_write = socksctpv_write },
+ VOPNAME_IOCTL, { .vop_ioctl = socksctpv_ioctl },
+ VOPNAME_SETFL, { .vop_setfl = socksctp_setfl },
+ VOPNAME_GETATTR, { .vop_getattr = socktpi_getattr },
+ VOPNAME_SETATTR, { .vop_setattr = socktpi_setattr },
+ VOPNAME_ACCESS, { .vop_access = socktpi_access },
+ VOPNAME_FSYNC, { .vop_fsync = socktpi_fsync },
+ VOPNAME_INACTIVE, { .vop_inactive = socksctpv_inactive },
+ VOPNAME_FID, { .vop_fid = socktpi_fid },
+ VOPNAME_SEEK, { .vop_seek = socktpi_seek },
+ VOPNAME_POLL, { .vop_poll = socksctpv_poll },
+ VOPNAME_DISPOSE, { .error = fs_error },
+ NULL, NULL
};
struct vnodeops *socksctp_vnodeops;
diff --git a/usr/src/uts/common/fs/sockfs/socksdp.c b/usr/src/uts/common/fs/sockfs/socksdp.c
index 197ff6997e..45f8713169 100755
--- a/usr/src/uts/common/fs/sockfs/socksdp.c
+++ b/usr/src/uts/common/fs/sockfs/socksdp.c
@@ -32,6 +32,7 @@
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
#include <sys/vnode.h>
#include <sys/debug.h>
#include <sys/errno.h>
diff --git a/usr/src/uts/common/fs/sockfs/socksdpsubr.c b/usr/src/uts/common/fs/sockfs/socksdpsubr.c
index 6ae3c4d03d..42884fa4be 100755
--- a/usr/src/uts/common/fs/sockfs/socksdpsubr.c
+++ b/usr/src/uts/common/fs/sockfs/socksdpsubr.c
@@ -37,6 +37,7 @@
#include <sys/sysmacros.h>
#include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
diff --git a/usr/src/uts/common/fs/sockfs/socksdpvnops.c b/usr/src/uts/common/fs/sockfs/socksdpvnops.c
index 6bdc83b20c..02cb7a07c1 100755
--- a/usr/src/uts/common/fs/sockfs/socksdpvnops.c
+++ b/usr/src/uts/common/fs/sockfs/socksdpvnops.c
@@ -35,6 +35,7 @@
#include <sys/errno.h>
#include <sys/uio.h>
#include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
#include <sys/vnode.h>
#include <sys/stropts.h>
#include <sys/cmn_err.h>
@@ -77,22 +78,22 @@ static int socksdpv_poll(struct vnode *, short, int, short *,
struct pollhead **);
const fs_operation_def_t socksdp_vnodeops_template[] = {
- VOPNAME_OPEN, socksdpv_open,
- VOPNAME_CLOSE, socksdpv_close,
- VOPNAME_READ, socksdpv_read,
- VOPNAME_WRITE, socksdpv_write,
- VOPNAME_IOCTL, socksdpv_ioctl,
- VOPNAME_SETFL, socksdp_setfl,
- VOPNAME_GETATTR, socktpi_getattr,
- VOPNAME_SETATTR, socktpi_setattr,
- VOPNAME_ACCESS, socktpi_access,
- VOPNAME_FSYNC, socktpi_fsync,
- VOPNAME_INACTIVE, (fs_generic_func_p) socksdpv_inactive,
- VOPNAME_FID, socktpi_fid,
- VOPNAME_SEEK, socktpi_seek,
- VOPNAME_POLL, (fs_generic_func_p) socksdpv_poll,
- VOPNAME_DISPOSE, fs_error,
- NULL, NULL
+ VOPNAME_OPEN, { .vop_open = socksdpv_open },
+ VOPNAME_CLOSE, { .vop_close = socksdpv_close },
+ VOPNAME_READ, { .vop_read = socksdpv_read },
+ VOPNAME_WRITE, { .vop_write = socksdpv_write },
+ VOPNAME_IOCTL, { .vop_ioctl = socksdpv_ioctl },
+ VOPNAME_SETFL, { .vop_setfl = socksdp_setfl },
+ VOPNAME_GETATTR, { .vop_getattr = socktpi_getattr },
+ VOPNAME_SETATTR, { .vop_setattr = socktpi_setattr },
+ VOPNAME_ACCESS, { .vop_access = socktpi_access },
+ VOPNAME_FSYNC, { .vop_fsync = socktpi_fsync },
+ VOPNAME_INACTIVE, { .vop_inactive = socksdpv_inactive },
+ VOPNAME_FID, { .vop_fid = socktpi_fid },
+ VOPNAME_SEEK, { .vop_seek = socktpi_seek },
+ VOPNAME_POLL, { .vop_poll = socksdpv_poll },
+ VOPNAME_DISPOSE, { .error = fs_error },
+ NULL, NULL
};
struct vnodeops *socksdp_vnodeops;
diff --git a/usr/src/uts/common/fs/sockfs/socksubr.c b/usr/src/uts/common/fs/sockfs/socksubr.c
index f9f5eed188..ad90f21a36 100644
--- a/usr/src/uts/common/fs/sockfs/socksubr.c
+++ b/usr/src/uts/common/fs/sockfs/socksubr.c
@@ -36,6 +36,7 @@
#include <sys/kmem.h>
#include <sys/sysmacros.h>
#include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
#include <sys/vnode.h>
#include <sys/debug.h>
#include <sys/errno.h>
diff --git a/usr/src/uts/common/fs/sockfs/sockvnops.c b/usr/src/uts/common/fs/sockfs/sockvnops.c
index 66224f437a..32b7f2d361 100644
--- a/usr/src/uts/common/fs/sockfs/sockvnops.c
+++ b/usr/src/uts/common/fs/sockfs/sockvnops.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -48,6 +48,7 @@
#include <sys/sysmacros.h>
#include <sys/uio.h>
#include <sys/vfs.h>
+#include <sys/vfs_opreg.h>
#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/stropts.h>
@@ -108,22 +109,22 @@ static int socktpi_poll(struct vnode *, short, int, short *,
struct vnodeops *socktpi_vnodeops;
const fs_operation_def_t socktpi_vnodeops_template[] = {
- VOPNAME_OPEN, socktpi_open,
- VOPNAME_CLOSE, socktpi_close,
- VOPNAME_READ, socktpi_read,
- VOPNAME_WRITE, socktpi_write,
- VOPNAME_IOCTL, socktpi_ioctl,
- VOPNAME_SETFL, socktpi_setfl,
- VOPNAME_GETATTR, socktpi_getattr,
- VOPNAME_SETATTR, socktpi_setattr,
- VOPNAME_ACCESS, socktpi_access,
- VOPNAME_FSYNC, socktpi_fsync,
- VOPNAME_INACTIVE, (fs_generic_func_p) socktpi_inactive,
- VOPNAME_FID, socktpi_fid,
- VOPNAME_SEEK, socktpi_seek,
- VOPNAME_POLL, (fs_generic_func_p) socktpi_poll,
- VOPNAME_DISPOSE, fs_error,
- NULL, NULL
+ VOPNAME_OPEN, { .vop_open = socktpi_open },
+ VOPNAME_CLOSE, { .vop_close = socktpi_close },
+ VOPNAME_READ, { .vop_read = socktpi_read },
+ VOPNAME_WRITE, { .vop_write = socktpi_write },
+ VOPNAME_IOCTL, { .vop_ioctl = socktpi_ioctl },
+ VOPNAME_SETFL, { .vop_setfl = socktpi_setfl },
+ VOPNAME_GETATTR, { .vop_getattr = socktpi_getattr },
+ VOPNAME_SETATTR, { .vop_setattr = socktpi_setattr },
+ VOPNAME_ACCESS, { .vop_access = socktpi_access },
+ VOPNAME_FSYNC, { .vop_fsync = socktpi_fsync },
+ VOPNAME_INACTIVE, { .vop_inactive = socktpi_inactive },
+ VOPNAME_FID, { .vop_fid = socktpi_fid },
+ VOPNAME_SEEK, { .vop_seek = socktpi_seek },
+ VOPNAME_POLL, { .vop_poll = socktpi_poll },
+ VOPNAME_DISPOSE, { .error = fs_error },
+ NULL, NULL
};
/*