diff options
author | bde <bde@FreeBSD.org> | 1996-02-25 20:12:36 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1996-02-25 20:12:36 +0000 |
commit | 5183c3b725c409c4eb1a51b3ca12c361a24579be (patch) | |
tree | 38a2ad211a00f6065ddb069760ed519722ba36b6 /sys | |
parent | b4af7453454ec17e34e2b367c32ca50c7b5df8e7 (diff) | |
download | FreeBSD-src-5183c3b725c409c4eb1a51b3ca12c361a24579be.zip FreeBSD-src-5183c3b725c409c4eb1a51b3ca12c361a24579be.tar.gz |
Removed vestigial support for the obsolete FIFO option. In ext2fs
it caused null pointer panics for all fifo operations unless FIFO
was defined.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/gnu/ext2fs/ext2_extern.h | 5 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 2 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_extern.h | 5 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vfsops.c | 2 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_extern.h | 3 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 4 |
6 files changed, 5 insertions, 16 deletions
diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h index 5b9623f..9b0ce98 100644 --- a/sys/gnu/ext2fs/ext2_extern.h +++ b/sys/gnu/ext2fs/ext2_extern.h @@ -117,9 +117,4 @@ __END_DECLS extern vop_t **ext2_vnodeop_p; extern vop_t **ext2_specop_p; -#ifdef FIFO extern vop_t **ext2_fifoop_p; -#define EXT2_FIFOOPS ext2_fifoop_p -#else -#define EXT2_FIFOOPS NULL -#endif diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index d517e95..b2abbd5 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -1011,7 +1011,7 @@ printf("ext2_vget(%d) dbn= %d ", ino, fsbtodb(fs, ino_to_fsba(fs, ino))); * Initialize the vnode from the inode, check for aliases. * Note that the underlying vnode may have changed. */ - if (error = ufs_vinit(mp, ext2_specop_p, EXT2_FIFOOPS, &vp)) { + if (error = ufs_vinit(mp, ext2_specop_p, ext2_fifoop_p, &vp)) { vput(vp); *vpp = NULL; return (error); diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h index 5b9623f..9b0ce98 100644 --- a/sys/gnu/fs/ext2fs/ext2_extern.h +++ b/sys/gnu/fs/ext2fs/ext2_extern.h @@ -117,9 +117,4 @@ __END_DECLS extern vop_t **ext2_vnodeop_p; extern vop_t **ext2_specop_p; -#ifdef FIFO extern vop_t **ext2_fifoop_p; -#define EXT2_FIFOOPS ext2_fifoop_p -#else -#define EXT2_FIFOOPS NULL -#endif diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index d517e95..b2abbd5 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -1011,7 +1011,7 @@ printf("ext2_vget(%d) dbn= %d ", ino, fsbtodb(fs, ino_to_fsba(fs, ino))); * Initialize the vnode from the inode, check for aliases. * Note that the underlying vnode may have changed. */ - if (error = ufs_vinit(mp, ext2_specop_p, EXT2_FIFOOPS, &vp)) { + if (error = ufs_vinit(mp, ext2_specop_p, ext2_fifoop_p, &vp)) { vput(vp); *vpp = NULL; return (error); diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index efcf06e..62ee2b5 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 - * $Id: ffs_extern.h,v 1.8 1995/11/09 08:14:04 bde Exp $ + * $Id: ffs_extern.h,v 1.9 1995/12/17 21:09:30 phk Exp $ */ struct buf; @@ -89,4 +89,3 @@ __END_DECLS extern vop_t **ffs_vnodeop_p; extern vop_t **ffs_specop_p; extern vop_t **ffs_fifoop_p; -#define FFS_FIFOOPS ffs_fifoop_p diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 7fe9299..83500cc 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $Id: ffs_vfsops.c,v 1.34 1996/01/14 18:54:59 bde Exp $ + * $Id: ffs_vfsops.c,v 1.35 1996/01/19 03:59:14 dyson Exp $ */ #include "opt_quota.h" @@ -920,7 +920,7 @@ restart: * Initialize the vnode from the inode, check for aliases. * Note that the underlying vnode may have changed. */ - error = ufs_vinit(mp, ffs_specop_p, FFS_FIFOOPS, &vp); + error = ufs_vinit(mp, ffs_specop_p, ffs_fifoop_p, &vp); if (error) { vput(vp); *vpp = NULL; |