diff options
| author | kcpoon <none@none> | 2007-02-23 09:48:45 -0800 |
|---|---|---|
| committer | kcpoon <none@none> | 2007-02-23 09:48:45 -0800 |
| commit | f284ee4cee09f53b09b31f33b1e2ebb38ab4b2cc (patch) | |
| tree | 039057a1317b8c2dd40b4e8c547011871cf2fbe6 /usr/src | |
| parent | 6e844434c7457266d0a9e058992427e1197b33b8 (diff) | |
| download | illumos-joyent-f284ee4cee09f53b09b31f33b1e2ebb38ab4b2cc.tar.gz | |
6523649 socksctpv_write() and socksdpv_write() in sockfs are missing caller_context_t args
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/sockfs/socksctpvnops.c | 14 | ||||
| -rwxr-xr-x | usr/src/uts/common/fs/sockfs/socksdpvnops.c | 12 |
2 files changed, 15 insertions, 11 deletions
diff --git a/usr/src/uts/common/fs/sockfs/socksctpvnops.c b/usr/src/uts/common/fs/sockfs/socksctpvnops.c index 4f898d6237..0adb375b15 100644 --- a/usr/src/uts/common/fs/sockfs/socksctpvnops.c +++ b/usr/src/uts/common/fs/sockfs/socksctpvnops.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. */ @@ -66,12 +66,13 @@ static int socksctpv_open(struct vnode **, int, struct cred *); static int socksctpv_close(struct vnode *, int, int, offset_t, struct cred *); -static int socksctpv_read(struct vnode *vp, struct uio *uiop, int ioflag, - struct cred *cr, struct caller_context *ct); -static int socksctpv_write(struct vnode *, struct uio *, int, struct cred *); +static int socksctpv_read(struct vnode *, struct uio *, int, struct cred *, + struct caller_context *); +static int socksctpv_write(struct vnode *, struct uio *, int, struct cred *, + struct caller_context *); static int socksctpv_ioctl(struct vnode *, int, intptr_t, int, struct cred *, int32_t *); -static int socksctp_setfl(vnode_t *vp, int oflags, int nflags, cred_t *cr); +static int socksctp_setfl(vnode_t *, int, int, cred_t *); static void socksctpv_inactive(struct vnode *, struct cred *); static int socksctpv_poll(struct vnode *, short, int, short *, struct pollhead **); @@ -264,7 +265,8 @@ socksctpv_read(struct vnode *vp, struct uio *uiop, int ioflag, struct cred *cr, */ /*ARGSUSED2*/ static int -socksctpv_write(struct vnode *vp, struct uio *uiop, int ioflag, struct cred *cr) +socksctpv_write(struct vnode *vp, struct uio *uiop, int ioflag, struct cred *cr, + struct caller_context *ct) { struct sctp_sonode *ss; struct sonode *so; diff --git a/usr/src/uts/common/fs/sockfs/socksdpvnops.c b/usr/src/uts/common/fs/sockfs/socksdpvnops.c index ada23d844d..6bdc83b20c 100755 --- a/usr/src/uts/common/fs/sockfs/socksdpvnops.c +++ b/usr/src/uts/common/fs/sockfs/socksdpvnops.c @@ -65,12 +65,13 @@ static int socksdpv_open(struct vnode **, int, struct cred *); static int socksdpv_close(struct vnode *, int, int, offset_t, struct cred *); -static int socksdpv_read(struct vnode *vp, struct uio *uiop, int ioflag, - struct cred *cr, struct caller_context *ct); -static int socksdpv_write(struct vnode *, struct uio *, int, struct cred *); +static int socksdpv_read(struct vnode *, struct uio *, int, struct cred *, + struct caller_context *); +static int socksdpv_write(struct vnode *, struct uio *, int, struct cred *, + struct caller_context *); static int socksdpv_ioctl(struct vnode *, int, intptr_t, int, struct cred *, int32_t *); -static int socksdp_setfl(vnode_t *vp, int oflags, int nflags, cred_t *cr); +static int socksdp_setfl(vnode_t *, int, int, cred_t *); static void socksdpv_inactive(struct vnode *, struct cred *); static int socksdpv_poll(struct vnode *, short, int, short *, struct pollhead **); @@ -232,7 +233,8 @@ socksdpv_read(struct vnode *vp, struct uio *uiop, int ioflag, struct cred *cr, */ /*ARGSUSED2*/ static int -socksdpv_write(struct vnode *vp, struct uio *uiop, int ioflag, struct cred *cr) +socksdpv_write(struct vnode *vp, struct uio *uiop, int ioflag, struct cred *cr, + struct caller_context *ct) { struct sonode *so; ssize_t count; |