diff options
| author | jg <none@none> | 2007-03-02 12:47:16 -0800 |
|---|---|---|
| committer | jg <none@none> | 2007-03-02 12:47:16 -0800 |
| commit | cbcfaf83d8f1bf6aa00c793903a55685cac2c548 (patch) | |
| tree | 692e84c57259e3613c3f7d7e0b320c0dae06fe7e /usr/src/uts/common/fs/dev | |
| parent | 25dfe2b18fb6dd87f84d482f5c5be61a8682bce3 (diff) | |
| download | illumos-gate-cbcfaf83d8f1bf6aa00c793903a55685cac2c548.tar.gz | |
6523265 sdev_vnops.c uses fs_sync for its fsync VOP routine
6523273 Several vnode operations have the wrong signature in sdev_vnops.c & sdev_ptsops.c
Diffstat (limited to 'usr/src/uts/common/fs/dev')
| -rw-r--r-- | usr/src/uts/common/fs/dev/sdev_ptsops.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/dev/sdev_vnops.c | 19 |
2 files changed, 13 insertions, 9 deletions
diff --git a/usr/src/uts/common/fs/dev/sdev_ptsops.c b/usr/src/uts/common/fs/dev/sdev_ptsops.c index 50ed639ddb..8cdbee7985 100644 --- a/usr/src/uts/common/fs/dev/sdev_ptsops.c +++ b/usr/src/uts/common/fs/dev/sdev_ptsops.c @@ -391,9 +391,10 @@ devpts_set_id(struct sdev_node *dv, struct vattr *vap, int protocol) } +/*ARGSUSED4*/ static int devpts_setattr(struct vnode *vp, struct vattr *vap, int flags, - struct cred *cred) + struct cred *cred, caller_context_t *ctp) { ASSERT((vp->v_type == VCHR) || (vp->v_type == VDIR)); return (devname_setattr_func(vp, vap, flags, cred, diff --git a/usr/src/uts/common/fs/dev/sdev_vnops.c b/usr/src/uts/common/fs/dev/sdev_vnops.c index 21e4b80ec3..9103a538c1 100644 --- a/usr/src/uts/common/fs/dev/sdev_vnops.c +++ b/usr/src/uts/common/fs/dev/sdev_vnops.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -244,8 +244,10 @@ sdev_getattr(struct vnode *vp, struct vattr *vap, int flags, struct cred *cr) return (error); } +/*ARGSUSED4*/ static int -sdev_setattr(struct vnode *vp, struct vattr *vap, int flags, struct cred *cred) +sdev_setattr(struct vnode *vp, struct vattr *vap, int flags, + struct cred *cred, caller_context_t *ctp) { return (devname_setattr_func(vp, vap, flags, cred, NULL, 0)); } @@ -1220,16 +1222,18 @@ sdev_fid(struct vnode *vp, struct fid *fidp) * and VOP_READDIR requests. The contents lock stops things * moving around while we're looking at them. */ -static void -sdev_rwlock(struct vnode *vp, int write_flag) +/*ARGSUSED2*/ +static int +sdev_rwlock(struct vnode *vp, int write_flag, caller_context_t *ctp) { - rw_enter(&VTOSDEV(vp)->sdev_contents, write_flag ? RW_WRITER : - RW_READER); + rw_enter(&VTOSDEV(vp)->sdev_contents, + write_flag ? RW_WRITER : RW_READER); + return (write_flag ? V_WRITELOCK_TRUE : V_WRITELOCK_FALSE); } /*ARGSUSED1*/ static void -sdev_rwunlock(struct vnode *vp, int write_flag) +sdev_rwunlock(struct vnode *vp, int write_flag, caller_context_t *ctp) { rw_exit(&VTOSDEV(vp)->sdev_contents); } @@ -1308,7 +1312,6 @@ const fs_operation_def_t sdev_vnodeops_tbl[] = { VOPNAME_READDIR, sdev_readdir, VOPNAME_SYMLINK, sdev_symlink, VOPNAME_READLINK, sdev_readlink, /* readlink */ - VOPNAME_FSYNC, (fs_generic_func_p) fs_sync, VOPNAME_INACTIVE, (fs_generic_func_p)sdev_inactive, VOPNAME_FID, sdev_fid, VOPNAME_RWLOCK, (fs_generic_func_p)sdev_rwlock, |