diff options
author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2011-04-05 14:14:08 +0000 |
---|---|---|
committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2011-04-05 14:14:08 +0000 |
commit | 09931756bf164ec239559a8c39bd52706b27241e (patch) | |
tree | 21563af8dce4f09f9b4664b7ce6a5d8a9ef5e8fc | |
parent | 7b465dd5593ff7b3f25c30ebff91f4a2c899fbb8 (diff) |
Every single vop_default is set to eopnotsupp, so retire it
and return EOPNOTSUPP directly from the VOP_* functions.
Filesystems should, at some point fill in every function
in the vop_default struct so we can get rid of the 'if'
statements in VOP_*.
-rw-r--r-- | sys/isofs/cd9660/cd9660_vnops.c | 5 | ||||
-rw-r--r-- | sys/isofs/udf/udf_vnops.c | 3 | ||||
-rw-r--r-- | sys/kern/spec_vnops.c | 3 | ||||
-rw-r--r-- | sys/kern/vfs_sync.c | 3 | ||||
-rw-r--r-- | sys/kern/vfs_vops.c | 110 | ||||
-rw-r--r-- | sys/miscfs/deadfs/dead_vnops.c | 3 | ||||
-rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 3 | ||||
-rw-r--r-- | sys/miscfs/procfs/procfs_vnops.c | 3 | ||||
-rw-r--r-- | sys/miscfs/specfs/spec_vnops.c | 3 | ||||
-rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 3 | ||||
-rw-r--r-- | sys/nfs/nfs_vnops.c | 5 | ||||
-rw-r--r-- | sys/nnpfs/nnpfs_vfsops-openbsd.c | 1 | ||||
-rw-r--r-- | sys/nnpfs/nnpfs_vnodeops-bsd.c | 1 | ||||
-rw-r--r-- | sys/ntfs/ntfs_vnops.c | 3 | ||||
-rw-r--r-- | sys/sys/vnode.h | 3 | ||||
-rw-r--r-- | sys/ufs/ext2fs/ext2fs_vnops.c | 5 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 5 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 3 |
18 files changed, 87 insertions, 78 deletions
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 3095674929a..39132e4d679 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vnops.c,v 1.52 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: cd9660_vnops.c,v 1.53 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */ /*- @@ -933,7 +933,6 @@ cd9660_pathconf(v) /* Global vfs data structures for cd9660. */ struct vops cd9660_vops = { - .vop_default = eopnotsupp, .vop_lookup = cd9660_lookup, .vop_create = cd9660_create, .vop_mknod = cd9660_mknod, @@ -972,7 +971,6 @@ struct vops cd9660_vops = { /* Special device vnode ops */ struct vops cd9660_specvops = { - .vop_default = eopnotsupp, .vop_access = cd9660_access, .vop_getattr = cd9660_getattr, .vop_setattr = cd9660_setattr, @@ -1014,7 +1012,6 @@ struct vops cd9660_specvops = { #ifdef FIFO struct vops cd9660_fifovops = { - .vop_default = eopnotsupp, .vop_access = cd9660_access, .vop_getattr = cd9660_getattr, .vop_setattr = cd9660_setattr, diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c index 401fd19021d..4ee30e5b07b 100644 --- a/sys/isofs/udf/udf_vnops.c +++ b/sys/isofs/udf/udf_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vnops.c,v 1.42 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: udf_vnops.c,v 1.43 2011/04/05 14:14:07 thib Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -58,7 +58,6 @@ int udf_bmap_internal(struct unode *, off_t, daddr64_t *, uint32_t *); struct vops udf_vops = { - .vop_default = eopnotsupp, .vop_access = udf_access, .vop_bmap = udf_bmap, .vop_lookup = udf_lookup, diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c index 2e613552f32..cb6a13a8e5b 100644 --- a/sys/kern/spec_vnops.c +++ b/sys/kern/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.61 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.62 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -57,7 +57,6 @@ struct vnode *speclisth[SPECHSZ]; struct vops spec_vops = { - .vop_default = eopnotsupp, .vop_lookup = vop_generic_lookup, .vop_create = spec_badop, .vop_mknod = spec_badop, diff --git a/sys/kern/vfs_sync.c b/sys/kern/vfs_sync.c index a326e9297e1..46c1e8aaa81 100644 --- a/sys/kern/vfs_sync.c +++ b/sys/kern/vfs_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_sync.c,v 1.49 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: vfs_sync.c,v 1.50 2011/04/05 14:14:07 thib Exp $ */ /* * Portions of this code are: @@ -260,7 +260,6 @@ int sync_inactive(void *); int sync_print(void *); struct vops sync_vops = { - .vop_default = eopnotsupp, .vop_close = nullop, .vop_fsync = sync_fsync, .vop_inactive = sync_inactive, diff --git a/sys/kern/vfs_vops.c b/sys/kern/vfs_vops.c index 40fb95c71f4..337da575cd0 100644 --- a/sys/kern/vfs_vops.c +++ b/sys/kern/vfs_vops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_vops.c,v 1.2 2010/09/08 10:50:27 thib Exp $ */ +/* $OpenBSD: vfs_vops.c,v 1.3 2011/04/05 14:14:07 thib Exp $ */ /* * Copyright (c) 2010 Thordur I. Bjornsson <thib@openbsd.org> * @@ -63,7 +63,7 @@ VOP_ISLOCKED(struct vnode *vp) a.a_vp = vp; if (vp->v_op->vop_islocked == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); return ((vp->v_op->vop_islocked)(&a)); } @@ -78,7 +78,7 @@ VOP_LOOKUP(struct vnode *dvp, struct vnode **vpp, a.a_cnp = cnp; if (dvp->v_op->vop_lookup == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); return ((dvp->v_op->vop_lookup)(&a)); } @@ -96,7 +96,8 @@ VOP_CREATE(struct vnode *dvp, struct vnode **vpp, ASSERT_VP_ISLOCKED(dvp); if (dvp->v_op->vop_create == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((dvp->v_op->vop_create)(&a)); } @@ -113,7 +114,8 @@ VOP_MKNOD(struct vnode *dvp, struct vnode **vpp, ASSERT_VP_ISLOCKED(dvp); if (dvp->v_op->vop_mknod == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((dvp->v_op->vop_mknod)(&a)); } @@ -127,7 +129,8 @@ VOP_OPEN(struct vnode *vp, int mode, struct ucred *cred, struct proc *p) a.a_p = p; if (vp->v_op->vop_open == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_open)(&a)); } @@ -143,7 +146,8 @@ VOP_CLOSE(struct vnode *vp, int fflag, struct ucred *cred, struct proc *p) ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_close == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_close)(&a)); } @@ -159,7 +163,8 @@ VOP_ACCESS(struct vnode *vp, int mode, struct ucred *cred, struct proc *p) ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_access == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_access)(&a)); } @@ -174,7 +179,8 @@ VOP_GETATTR(struct vnode *vp, struct vattr *vap, struct ucred *cred, a.a_p = p; if (vp->v_op->vop_getattr == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_getattr)(&a)); } @@ -191,7 +197,8 @@ VOP_SETATTR(struct vnode *vp, struct vattr *vap, struct ucred *cred, ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_setattr == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_setattr)(&a)); } @@ -207,7 +214,8 @@ VOP_READ(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred) ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_read == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_read)(&a)); } @@ -224,7 +232,8 @@ VOP_WRITE(struct vnode *vp, struct uio *uio, int ioflag, ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_write == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_write)(&a)); } @@ -241,8 +250,10 @@ VOP_IOCTL(struct vnode *vp, u_long command, void *data, int fflag, a.a_p = p; if (vp->v_op->vop_ioctl == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_ioctl)(&a)); + } int @@ -254,7 +265,8 @@ VOP_POLL(struct vnode *vp, int events, struct proc *p) a.a_p = p; if (vp->v_op->vop_poll == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_poll)(&a)); } @@ -266,7 +278,8 @@ VOP_KQFILTER(struct vnode *vp, struct knote *kn) a.a_kn = kn; if (vp->v_op->vop_kqfilter == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_kqfilter)(&a)); } @@ -278,7 +291,8 @@ VOP_REVOKE(struct vnode *vp, int flags) a.a_flags = flags; if (vp->v_op->vop_revoke == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_revoke)(&a)); } @@ -295,7 +309,8 @@ VOP_FSYNC(struct vnode *vp, struct ucred *cred, int waitfor, ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_fsync == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_fsync)(&a)); } @@ -311,7 +326,8 @@ VOP_REMOVE(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) ASSERT_VP_ISLOCKED(vp); if (dvp->v_op->vop_remove == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((dvp->v_op->vop_remove)(&a)); } @@ -326,7 +342,8 @@ VOP_LINK(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) ASSERT_VP_ISLOCKED(dvp); if (dvp->v_op->vop_link == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((dvp->v_op->vop_link)(&a)); } @@ -346,7 +363,8 @@ VOP_RENAME(struct vnode *fdvp, struct vnode *fvp, ASSERT_VP_ISLOCKED(tdvp); if (fdvp->v_op->vop_rename == NULL) - return ((fdvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((fdvp->v_op->vop_rename)(&a)); } @@ -363,7 +381,8 @@ VOP_MKDIR(struct vnode *dvp, struct vnode **vpp, ASSERT_VP_ISLOCKED(dvp); if (dvp->v_op->vop_mkdir == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((dvp->v_op->vop_mkdir)(&a)); } @@ -379,7 +398,8 @@ VOP_RMDIR(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) ASSERT_VP_ISLOCKED(vp); if (dvp->v_op->vop_rmdir == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((dvp->v_op->vop_rmdir)(&a)); } @@ -397,7 +417,8 @@ VOP_SYMLINK(struct vnode *dvp, struct vnode **vpp, ASSERT_VP_ISLOCKED(dvp); if (dvp->v_op->vop_symlink == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((dvp->v_op->vop_symlink)(&a)); } @@ -416,7 +437,8 @@ VOP_READDIR(struct vnode *vp, struct uio *uio, struct ucred *cred, ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_readdir == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_readdir)(&a)); } @@ -431,7 +453,8 @@ VOP_READLINK(struct vnode *vp, struct uio *uio, struct ucred *cred) ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_readlink == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_readlink)(&a)); } @@ -443,7 +466,8 @@ VOP_ABORTOP(struct vnode *dvp, struct componentname *cnp) a.a_cnp = cnp; if (dvp->v_op->vop_abortop == NULL) - return ((dvp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((dvp->v_op->vop_abortop)(&a)); } @@ -457,7 +481,8 @@ VOP_INACTIVE(struct vnode *vp, struct proc *p) ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_inactive == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_inactive)(&a)); } @@ -469,7 +494,8 @@ VOP_RECLAIM(struct vnode *vp, struct proc *p) a.a_p = p; if (vp->v_op->vop_reclaim == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_reclaim)(&a)); } @@ -482,7 +508,8 @@ VOP_LOCK(struct vnode *vp, int flags, struct proc *p) a.a_p = p; if (vp->v_op->vop_lock == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_lock)(&a)); } @@ -495,7 +522,8 @@ VOP_UNLOCK(struct vnode *vp, int flags, struct proc *p) a.a_p = p; if (vp->v_op->vop_unlock == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_unlock)(&a)); } @@ -513,7 +541,8 @@ VOP_BMAP(struct vnode *vp, daddr64_t bn, struct vnode **vpp, ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_bmap == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_bmap)(&a)); } @@ -524,7 +553,8 @@ VOP_PRINT(struct vnode *vp) a.a_vp = vp; if (vp->v_op->vop_print == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_print)(&a)); } @@ -539,7 +569,8 @@ VOP_PATHCONF(struct vnode *vp, int name, register_t *retval) ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_pathconf == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_pathconf)(&a)); } @@ -554,7 +585,8 @@ VOP_ADVLOCK(struct vnode *vp, void *id, int op, struct flock *fl, int flags) a.a_flags = flags; if (vp->v_op->vop_advlock == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_advlock)(&a)); } @@ -568,7 +600,8 @@ VOP_REALLOCBLKS(struct vnode *vp, struct cluster_save *buflist) ASSERT_VP_ISLOCKED(vp); if (vp->v_op->vop_reallocblks == NULL) - return ((vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((vp->v_op->vop_reallocblks)(&a)); } @@ -579,7 +612,8 @@ VOP_STRATEGY(struct buf *bp) a.a_bp = bp; if (bp->b_vp->v_op->vop_strategy == NULL) - return ((bp->b_vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((bp->b_vp->v_op->vop_strategy)(&a)); } @@ -590,7 +624,7 @@ VOP_BWRITE(struct buf *bp) a.a_bp = bp; if (bp->b_vp->v_op->vop_bwrite == NULL) - return ((bp->b_vp->v_op->vop_default)(&a)); + return (EOPNOTSUPP); + return ((bp->b_vp->v_op->vop_bwrite)(&a)); } -/* End of special cases. */ diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index 2c3e9520969..c5b197ac490 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dead_vnops.c,v 1.25 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: dead_vnops.c,v 1.26 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $ */ /* @@ -61,7 +61,6 @@ int dead_print(void *); int chkvnlock(struct vnode *); struct vops dead_vops = { - .vop_default = eopnotsupp, .vop_lookup = vop_generic_lookup, .vop_create = dead_badop, .vop_mknod = dead_badop, diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index f00851c0713..3ca1c27c7ee 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fifo_vnops.c,v 1.34 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: fifo_vnops.c,v 1.35 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $ */ /* @@ -62,7 +62,6 @@ struct fifoinfo { }; struct vops fifo_vops = { - .vop_default = eopnotsupp, .vop_lookup = vop_generic_lookup, .vop_create = fifo_badop, .vop_mknod = fifo_badop, diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 5ef2fb8bae9..eca4a8fca0d 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procfs_vnops.c,v 1.51 2011/04/02 17:04:35 guenther Exp $ */ +/* $OpenBSD: procfs_vnops.c,v 1.52 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: procfs_vnops.c,v 1.40 1996/03/16 23:52:55 christos Exp $ */ /* @@ -139,7 +139,6 @@ static pid_t atopid(const char *, u_int); * procfs vnode operations. */ struct vops procfs_vops = { - .vop_default = eopnotsupp, .vop_lookup = procfs_lookup, .vop_create = procfs_badop, .vop_mknod = procfs_badop, diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 2e613552f32..cb6a13a8e5b 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.61 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.62 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -57,7 +57,6 @@ struct vnode *speclisth[SPECHSZ]; struct vops spec_vops = { - .vop_default = eopnotsupp, .vop_lookup = vop_generic_lookup, .vop_create = spec_badop, .vop_mknod = spec_badop, diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index ed972c4bc32..29a3d35060e 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.76 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.77 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -1816,7 +1816,6 @@ fileidhash(uint64_t fileid) /* Global vfs data structures for msdosfs */ struct vops msdosfs_vops = { - .vop_default = eopnotsupp, .vop_lookup = msdosfs_lookup, .vop_create = msdosfs_create, .vop_mknod = msdosfs_mknod, diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 60d37c01b97..095fbbd2e1c 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.133 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.134 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -85,7 +85,6 @@ void nfs_cache_enter(struct vnode *, struct vnode *, struct componentname *); /* Global vfs data structures for nfs. */ struct vops nfs_vops = { - .vop_default = eopnotsupp, .vop_lookup = nfs_lookup, .vop_create = nfs_create, .vop_mknod = nfs_mknod, @@ -125,7 +124,6 @@ struct vops nfs_vops = { /* Special device vnode ops. */ struct vops nfs_specvops = { - .vop_default = eopnotsupp, .vop_close = nfsspec_close, .vop_access = nfsspec_access, .vop_getattr = nfs_getattr, @@ -167,7 +165,6 @@ struct vops nfs_specvops = { #ifdef FIFO struct vops nfs_fifovops = { - .vop_default = eopnotsupp, .vop_close = nfsfifo_close, .vop_access = nfsspec_access, .vop_getattr = nfs_getattr, diff --git a/sys/nnpfs/nnpfs_vfsops-openbsd.c b/sys/nnpfs/nnpfs_vfsops-openbsd.c index 24100c7c2a5..f6b46ea6fec 100644 --- a/sys/nnpfs/nnpfs_vfsops-openbsd.c +++ b/sys/nnpfs/nnpfs_vfsops-openbsd.c @@ -46,7 +46,6 @@ RCSID("$arla: nnpfs_vfsops-openbsd.c,v 1.16 2003/06/02 18:26:50 lha Exp $"); struct vops nnpfs_deadvops = { - .vop_default = (vop_t *)nnpfs_eopnotsupp, .vop_lookup = (vop_t *)nnpfs_dead_lookup, .vop_reclaim = (vop_t *)nnpfs_returnzero, .vop_lock = vop_generic_lock, diff --git a/sys/nnpfs/nnpfs_vnodeops-bsd.c b/sys/nnpfs/nnpfs_vnodeops-bsd.c index 0fa50213ad2..7a2ec58f7ba 100644 --- a/sys/nnpfs/nnpfs_vnodeops-bsd.c +++ b/sys/nnpfs/nnpfs_vnodeops-bsd.c @@ -1394,7 +1394,6 @@ nnpfs_pushdirty(struct vnode *vp, struct ucred *cred, d_thread_t *p) struct vops nnpfs_vops = { - .vop_default = (vop_t *)nnpfs_eopnotsupp, #ifdef HAVE_VOP_LOOKUP .vop_lookup = (vop_t *)nnpfs_lookup, #endif diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c index 94afc01488a..705855da01e 100644 --- a/sys/ntfs/ntfs_vnops.c +++ b/sys/ntfs/ntfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_vnops.c,v 1.22 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: ntfs_vnops.c,v 1.23 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: ntfs_vnops.c,v 1.6 2003/04/10 21:57:26 jdolecek Exp $ */ /* @@ -741,7 +741,6 @@ ntfs_pathconf(void *v) * Global vfs data structures */ struct vops ntfs_vops = { - .vop_default = eopnotsupp, .vop_getattr = ntfs_getattr, .vop_inactive = ntfs_inactive, .vop_reclaim = ntfs_reclaim, diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index a1c50a28332..bd72d215034 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vnode.h,v 1.107 2010/12/21 20:14:43 thib Exp $ */ +/* $OpenBSD: vnode.h,v 1.108 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */ /* @@ -260,7 +260,6 @@ extern void vdrop(struct vnode *); /* vnode operations */ struct vops { - int (*vop_default)(void *); int (*vop_lock)(void *); int (*vop_unlock)(void *); int (*vop_islocked)(void *); diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index 1d3d8806013..fd3331a80d9 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.58 2010/12/21 20:14:44 thib Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.59 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -1255,7 +1255,6 @@ ext2fs_reclaim(void *v) /* Global vfs data structures for ext2fs. */ struct vops ext2fs_vops = { - .vop_default = eopnotsupp, .vop_lookup = ext2fs_lookup, .vop_create = ext2fs_create, .vop_mknod = ext2fs_mknod, @@ -1293,7 +1292,6 @@ struct vops ext2fs_vops = { }; struct vops ext2fs_specvops = { - .vop_default = eopnotsupp, .vop_close = ufsspec_close, .vop_access = ext2fs_access, .vop_getattr = ext2fs_getattr, @@ -1335,7 +1333,6 @@ struct vops ext2fs_specvops = { #ifdef FIFO struct vops ext2fs_fifovops = { - .vop_default = eopnotsupp, .vop_close = ufsfifo_close, .vop_access = ufsfifo_close, .vop_getattr = ext2fs_getattr, diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 09eedf7f34c..efdb9ae42ee 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vnops.c,v 1.60 2010/12/29 21:28:45 thib Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.61 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -63,7 +63,6 @@ #include <ufs/ffs/ffs_extern.h> struct vops ffs_vops = { - .vop_default = eopnotsupp, .vop_lookup = ufs_lookup, .vop_create = ufs_create, .vop_mknod = ufs_mknod, @@ -103,7 +102,6 @@ struct vops ffs_vops = { }; struct vops ffs_specvops = { - .vop_default = eopnotsupp, .vop_close = ufsspec_close, .vop_access = ufs_access, .vop_getattr = ufs_getattr, @@ -145,7 +143,6 @@ struct vops ffs_specvops = { #ifdef FIFO struct vops ffs_fifovops = { - .vop_default = eopnotsupp, .vop_close = ufsfifo_close, .vop_access = ufs_access, .vop_getattr = ufs_getattr, diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 47bf2f3fa4b..f9831d02740 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vnops.c,v 1.40 2010/12/21 20:14:44 thib Exp $ */ +/* $OpenBSD: mfs_vnops.c,v 1.41 2011/04/05 14:14:07 thib Exp $ */ /* $NetBSD: mfs_vnops.c,v 1.8 1996/03/17 02:16:32 christos Exp $ */ /* @@ -50,7 +50,6 @@ /* mfs vnode operations. */ struct vops mfs_vops = { - .vop_default = eopnotsupp, .vop_lookup = mfs_badop, .vop_create = mfs_badop, .vop_mknod = mfs_badop, |