summaryrefslogtreecommitdiffstats
path: root/sys/miscfs/deadfs
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1997-10-26 20:55:39 +0000
committerphk <phk@FreeBSD.org>1997-10-26 20:55:39 +0000
commite3cdaf12b2b1039b21a615be67756c1d2e49a342 (patch)
tree938be7b5e64d05ad10e17ada8dfae77d07754414 /sys/miscfs/deadfs
parentd9574c43edc723778db9f6eefab8d2a1695c279b (diff)
downloadFreeBSD-src-e3cdaf12b2b1039b21a615be67756c1d2e49a342.zip
FreeBSD-src-e3cdaf12b2b1039b21a615be67756c1d2e49a342.tar.gz
VFS interior redecoration.
Rename vn_default_error to vop_defaultop all over the place. Move vn_bwrite from vfs_bio.c to vfs_default.c and call it vop_stdbwrite. Use vop_null instead of nullop. Move vop_nopoll from vfs_subr.c to vfs_default.c Move vop_sharedlock from vfs_subr.c to vfs_default.c Move vop_nolock from vfs_subr.c to vfs_default.c Move vop_nounlock from vfs_subr.c to vfs_default.c Move vop_noislocked from vfs_subr.c to vfs_default.c Use vop_ebadf instead of *_ebadf. Add vop_defaultop for getpages on master vnode in MFS.
Diffstat (limited to 'sys/miscfs/deadfs')
-rw-r--r--sys/miscfs/deadfs/dead_vnops.c33
1 files changed, 11 insertions, 22 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index c4bc9dc..6888f35 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.19 1997/10/16 20:32:24 phk Exp $
+ * $Id: dead_vnops.c,v 1.20 1997/10/16 21:59:55 phk Exp $
*/
#include <sys/param.h>
@@ -45,7 +45,6 @@ static int chkvnlock __P((struct vnode *));
* Prototypes for dead operations on vnodes.
*/
static int dead_badop __P((void));
-static int dead_ebadf __P((void));
static int dead_lookup __P((struct vop_lookup_args *));
static int dead_open __P((struct vop_open_args *));
static int dead_read __P((struct vop_read_args *));
@@ -57,13 +56,13 @@ static int dead_print __P((struct vop_print_args *));
vop_t **dead_vnodeop_p;
static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
- { &vop_default_desc, (vop_t *) vn_default_error },
- { &vop_access_desc, (vop_t *) dead_ebadf },
- { &vop_advlock_desc, (vop_t *) dead_ebadf },
+ { &vop_default_desc, (vop_t *) vop_defaultop },
+ { &vop_access_desc, (vop_t *) vop_ebadf },
+ { &vop_advlock_desc, (vop_t *) vop_ebadf },
{ &vop_bmap_desc, (vop_t *) dead_bmap },
{ &vop_create_desc, (vop_t *) dead_badop },
- { &vop_getattr_desc, (vop_t *) dead_ebadf },
- { &vop_inactive_desc, (vop_t *) nullop },
+ { &vop_getattr_desc, (vop_t *) vop_ebadf },
+ { &vop_inactive_desc, (vop_t *) vop_null },
{ &vop_ioctl_desc, (vop_t *) dead_ioctl },
{ &vop_link_desc, (vop_t *) dead_badop },
{ &vop_lock_desc, (vop_t *) dead_lock },
@@ -72,16 +71,16 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
{ &vop_mknod_desc, (vop_t *) dead_badop },
{ &vop_mmap_desc, (vop_t *) dead_badop },
{ &vop_open_desc, (vop_t *) dead_open },
- { &vop_pathconf_desc, (vop_t *) dead_ebadf }, /* per pathconf(2) */
+ { &vop_pathconf_desc, (vop_t *) vop_ebadf }, /* per pathconf(2) */
{ &vop_print_desc, (vop_t *) dead_print },
{ &vop_read_desc, (vop_t *) dead_read },
- { &vop_readdir_desc, (vop_t *) dead_ebadf },
- { &vop_readlink_desc, (vop_t *) dead_ebadf },
- { &vop_reclaim_desc, (vop_t *) nullop },
+ { &vop_readdir_desc, (vop_t *) vop_ebadf },
+ { &vop_readlink_desc, (vop_t *) vop_ebadf },
+ { &vop_reclaim_desc, (vop_t *) vop_null },
{ &vop_remove_desc, (vop_t *) dead_badop },
{ &vop_rename_desc, (vop_t *) dead_badop },
{ &vop_rmdir_desc, (vop_t *) dead_badop },
- { &vop_setattr_desc, (vop_t *) dead_ebadf },
+ { &vop_setattr_desc, (vop_t *) vop_ebadf },
{ &vop_symlink_desc, (vop_t *) dead_badop },
{ &vop_write_desc, (vop_t *) dead_write },
{ NULL, NULL }
@@ -261,16 +260,6 @@ dead_print(ap)
}
/*
- * Empty vnode failed operation
- */
-static int
-dead_ebadf()
-{
-
- return (EBADF);
-}
-
-/*
* Empty vnode bad operation
*/
static int
OpenPOWER on IntegriCloud