mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Removed vestigial support for the obsolete FIFO option. In ext2fs
it caused null pointer panics for all fifo operations unless FIFO was defined.
This commit is contained in:
parent
66c201eaba
commit
e6302eab11
6 changed files with 5 additions and 16 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue