diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -41,11 +41,8 @@ * Prototypes for dead operations on vnodes. */ static vop_lookup_t dead_lookup; -static vop_open_t dead_open; -static vop_close_t dead_close; static vop_getwritemount_t dead_getwritemount; static vop_rename_t dead_rename; -static vop_unset_text_t dead_unset_text; struct vop_vector dead_vnodeops = { .vop_default = &default_vnodeops, @@ -53,17 +50,13 @@ .vop_access = VOP_EBADF, .vop_advlock = VOP_EBADF, .vop_bmap = VOP_EBADF, - .vop_close = dead_close, .vop_create = VOP_PANIC, .vop_getattr = VOP_EBADF, .vop_getwritemount = dead_getwritemount, - .vop_inactive = VOP_NULL, .vop_ioctl = VOP_EBADF, .vop_link = VOP_PANIC, - .vop_lookup = dead_lookup, .vop_mkdir = VOP_PANIC, .vop_mknod = VOP_PANIC, - .vop_open = dead_open, .vop_pathconf = VOP_EBADF, /* per pathconf(2) */ .vop_poll = dead_poll, .vop_read = dead_read, @@ -76,7 +69,7 @@ .vop_setattr = VOP_EBADF, .vop_symlink = VOP_PANIC, .vop_vptocnp = VOP_EBADF, - .vop_unset_text = dead_unset_text, + .vop_unset_text = VOP_NULL, .vop_write = dead_write, .vop_fplookup_vexec = VOP_EOPNOTSUPP, .vop_fplookup_symlink = VOP_EOPNOTSUPP, @@ -91,32 +84,6 @@ return (0); } -/* - * Trivial lookup routine that always fails. - */ -static int -dead_lookup(struct vop_lookup_args *ap) -{ - - *ap->a_vpp = NULL; - return (ENOTDIR); -} - -/* - * Silently succeed open and close. - */ -static int -dead_open(struct vop_open_args *ap) -{ - return (0); -} - -static int -dead_close(struct vop_close_args *ap) -{ - return (0); -} - int dead_read(struct vop_read_args *ap) { @@ -158,9 +125,3 @@ return (EXDEV); } -static int -dead_unset_text(struct vop_unset_text_args *ap) -{ - - return (0); -}