summaryrefslogtreecommitdiff
path: root/sys/isofs/cd9660/cd9660_vfsops.c
diff options
context:
space:
mode:
authorThordur I. Bjornsson <thib@cvs.openbsd.org>2010-09-10 16:34:10 +0000
committerThordur I. Bjornsson <thib@cvs.openbsd.org>2010-09-10 16:34:10 +0000
commit924988b6ec2a9e6a026b5489028ad504451931ac (patch)
tree1b3c600d98211e262609942c2f20c60816cd46ec /sys/isofs/cd9660/cd9660_vfsops.c
parentdc82911ae9236515748693d3963bcf4c56827fcb (diff)
Backout the VOP diff until the issues naddy was seeing on alpha (gcc3)
have been resolved.
Diffstat (limited to 'sys/isofs/cd9660/cd9660_vfsops.c')
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 369799e3794..135796038ba 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd9660_vfsops.c,v 1.54 2010/09/06 23:44:10 thib Exp $ */
+/* $OpenBSD: cd9660_vfsops.c,v 1.55 2010/09/10 16:34:08 thib Exp $ */
/* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */
/*-
@@ -765,7 +765,7 @@ retry:
return (0);
/* Allocate a new vnode/iso_node. */
- if ((error = getnewvnode(VT_ISOFS, mp, &cd9660_vops, &vp)) != 0) {
+ if ((error = getnewvnode(VT_ISOFS, mp, cd9660_vnodeop_p, &vp)) != 0) {
*vpp = NULLVP;
return (error);
}
@@ -907,7 +907,7 @@ retry:
switch (vp->v_type = IFTOVT(ip->inode.iso_mode)) {
case VFIFO:
#ifdef FIFO
- vp->v_op = &cd9660_fifovops;
+ vp->v_op = cd9660_fifoop_p;
break;
#else
vput(vp);
@@ -922,7 +922,7 @@ retry:
if (dp = iso_dmap(dev, ino, 0))
ip->inode.iso_rdev = dp->d_dev;
#endif
- vp->v_op = &cd9660_specvops;
+ vp->v_op = cd9660_specop_p;
if ((nvp = checkalias(vp, ip->inode.iso_rdev, mp)) != NULL) {
/*
* Discard unneeded vnode, but save its iso_node.
@@ -930,7 +930,7 @@ retry:
*/
nvp->v_data = vp->v_data;
vp->v_data = NULL;
- vp->v_op = &spec_vops;
+ vp->v_op = spec_vnodeop_p;
vrele(vp);
vgone(vp);
/*