diff options
author | phk <phk@FreeBSD.org> | 2003-06-15 19:49:14 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2003-06-15 19:49:14 +0000 |
commit | ad04f297578d3ace7f7b7970359bf98c6429b8da (patch) | |
tree | b4cab32d8f52d27f39023685778e6c579dade983 /sys/fs | |
parent | fc203320de2c12fe6f2f78957ade3053f9a1c9ff (diff) | |
download | FreeBSD-src-ad04f297578d3ace7f7b7970359bf98c6429b8da.zip FreeBSD-src-ad04f297578d3ace7f7b7970359bf98c6429b8da.tar.gz |
I have not had any reports of trouble for a long time, so remove the
gentle versions of the vop_strategy()/vop_specstrategy() mismatch methods
and use vop_panic() instead.
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/specfs/spec_vnops.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index b53c819..0267bc1 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -67,7 +67,6 @@ static int spec_open(struct vop_open_args *); static int spec_poll(struct vop_poll_args *); static int spec_print(struct vop_print_args *); static int spec_read(struct vop_read_args *); -static int spec_strategy(struct vop_strategy_args *); static int spec_specstrategy(struct vop_specstrategy_args *); static int spec_write(struct vop_write_args *); @@ -103,7 +102,7 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = { { &vop_rmdir_desc, (vop_t *) vop_panic }, { &vop_setattr_desc, (vop_t *) vop_ebadf }, { &vop_specstrategy_desc, (vop_t *) spec_specstrategy }, - { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_strategy_desc, (vop_t *) vop_panic }, { &vop_symlink_desc, (vop_t *) vop_panic }, { &vop_write_desc, (vop_t *) spec_write }, { NULL, NULL } @@ -515,30 +514,6 @@ spec_xstrategy(struct vnode *vp, struct buf *bp) return (0); } -/* - * Decoy strategy routine. We should always come in via the specstrategy - * method, but in case some code has botched it, we have a strategy as - * well. We will deal with the request anyway and first time around we - * print some debugging useful information. - */ - -static int -spec_strategy(ap) - struct vop_strategy_args /* { - struct vnode *a_vp; - struct buf *a_bp; - } */ *ap; -{ - static int once; - - if (!once) { - vprint("VOP_STRATEGY on VCHR", ap->a_vp); - backtrace(); - once++; - } - return spec_xstrategy(ap->a_vp, ap->a_bp); -} - static int spec_specstrategy(ap) struct vop_specstrategy_args /* { |