39c39
< * $Id: cd9660_vnops.c,v 1.44 1997/10/16 10:47:47 phk Exp $
---
> * $Id: cd9660_vnops.c,v 1.45 1997/10/16 20:32:21 phk Exp $
72,73d71
< static int cd9660_lock __P((struct vop_lock_args *));
< static int cd9660_unlock __P((struct vop_unlock_args *));
76d73
< static int cd9660_islocked __P((struct vop_islocked_args *));
721,754d717
< * Lock an inode.
< */
< static int
< cd9660_lock(ap)
< struct vop_lock_args /* {
< struct vnode *a_vp;
< int a_flags;
< struct proc *a_p;
< } */ *ap;
< {
< struct vnode *vp = ap->a_vp;
<
< return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags, &vp->v_interlock,
< ap->a_p));
< }
<
< /*
< * Unlock an inode.
< */
< static int
< cd9660_unlock(ap)
< struct vop_unlock_args /* {
< struct vnode *a_vp;
< int a_flags;
< struct proc *a_p;
< } */ *ap;
< {
< struct vnode *vp = ap->a_vp;
<
< return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags | LK_RELEASE,
< &vp->v_interlock, ap->a_p));
< }
<
< /*
808,820d770
< * Check for a locked inode.
< */
< int
< cd9660_islocked(ap)
< struct vop_islocked_args /* {
< struct vnode *a_vp;
< } */ *ap;
< {
<
< return (lockstatus(&VTOI(ap->a_vp)->i_lock));
< }
<
< /*
872,873c822,823
< { &vop_islocked_desc, (vop_t *) cd9660_islocked },
< { &vop_lock_desc, (vop_t *) cd9660_lock },
---
> { &vop_islocked_desc, (vop_t *) vop_stdislocked },
> { &vop_lock_desc, (vop_t *) vop_stdlock },
883c833
< { &vop_unlock_desc, (vop_t *) cd9660_unlock },
---
> { &vop_unlock_desc, (vop_t *) vop_stdunlock },
899,900c849,850
< { &vop_islocked_desc, (vop_t *) cd9660_islocked },
< { &vop_lock_desc, (vop_t *) cd9660_lock },
---
> { &vop_islocked_desc, (vop_t *) vop_stdislocked },
> { &vop_lock_desc, (vop_t *) vop_stdlock },
904c854
< { &vop_unlock_desc, (vop_t *) cd9660_unlock },
---
> { &vop_unlock_desc, (vop_t *) vop_stdunlock },
917,918c867,868
< { &vop_islocked_desc, (vop_t *) cd9660_islocked },
< { &vop_lock_desc, (vop_t *) cd9660_lock },
---
> { &vop_islocked_desc, (vop_t *) vop_stdislocked },
> { &vop_lock_desc, (vop_t *) vop_stdlock },
922c872
< { &vop_unlock_desc, (vop_t *) cd9660_unlock },
---
> { &vop_unlock_desc, (vop_t *) vop_stdunlock },