diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1998-08-24 17:47:25 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1998-08-24 17:47:25 +0000 |
| commit | 1d9b3ba13d70ef8bb56b45067f99e9c217d48275 (patch) | |
| tree | 66c951fe90a9f42108b9837d377a013217a64001 /sys | |
| parent | f821426e674f91d98c34551417dc6737fb5491f4 (diff) | |
| download | src-test2-1d9b3ba13d70ef8bb56b45067f99e9c217d48275.tar.gz src-test2-1d9b3ba13d70ef8bb56b45067f99e9c217d48275.zip | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fs/specfs/spec_vnops.c | 16 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/specfs/spec_vnops.c | 16 |
3 files changed, 7 insertions, 31 deletions
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index e94d05fa1045..18748e896ace 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $Id: spec_vnops.c,v 1.67 1998/07/15 02:32:22 bde Exp $ + * $Id: spec_vnops.c,v 1.68 1998/08/23 11:43:29 bde Exp $ */ #include <sys/param.h> @@ -417,19 +417,9 @@ spec_ioctl(ap) switch (ap->a_vp->v_type) { case VCHR: - return ((*cdevsw[major(dev)]->d_ioctl)(dev, ap->a_command, ap->a_data, - ap->a_fflag, ap->a_p)); - case VBLK: - if (ap->a_command == 0 && (intptr_t)ap->a_data == B_TAPE) - if ((bdevsw[major(dev)]->d_flags & D_TYPEMASK) == - D_TAPE) - return (0); - else - return (1); - return ((*bdevsw[major(dev)]->d_ioctl)(dev, ap->a_command, ap->a_data, - ap->a_fflag, ap->a_p)); - + return ((*cdevsw[major(dev)]->d_ioctl)(dev, ap->a_command, + ap->a_data, ap->a_fflag, ap->a_p)); default: panic("spec_ioctl"); /* NOTREACHED */ diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index dd63c5ca0fef..93448cf3ba92 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $Id: vfs_bio.c,v 1.169 1998/08/13 08:09:07 dfr Exp $ + * $Id: vfs_bio.c,v 1.170 1998/08/24 08:39:38 dfr Exp $ */ /* @@ -459,10 +459,6 @@ bdwrite(struct buf * bp) brelse(bp); return; } - if (bp->b_flags & B_TAPE) { - bawrite(bp); - return; - } bp->b_flags &= ~(B_READ|B_RELBUF); if ((bp->b_flags & B_DELWRI) == 0) { bp->b_flags |= B_DONE | B_DELWRI; diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index e94d05fa1045..18748e896ace 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $Id: spec_vnops.c,v 1.67 1998/07/15 02:32:22 bde Exp $ + * $Id: spec_vnops.c,v 1.68 1998/08/23 11:43:29 bde Exp $ */ #include <sys/param.h> @@ -417,19 +417,9 @@ spec_ioctl(ap) switch (ap->a_vp->v_type) { case VCHR: - return ((*cdevsw[major(dev)]->d_ioctl)(dev, ap->a_command, ap->a_data, - ap->a_fflag, ap->a_p)); - case VBLK: - if (ap->a_command == 0 && (intptr_t)ap->a_data == B_TAPE) - if ((bdevsw[major(dev)]->d_flags & D_TYPEMASK) == - D_TAPE) - return (0); - else - return (1); - return ((*bdevsw[major(dev)]->d_ioctl)(dev, ap->a_command, ap->a_data, - ap->a_fflag, ap->a_p)); - + return ((*cdevsw[major(dev)]->d_ioctl)(dev, ap->a_command, + ap->a_data, ap->a_fflag, ap->a_p)); default: panic("spec_ioctl"); /* NOTREACHED */ |