proper setup for FIFO's

SCCS-vsn: sys/ufs/lfs/lfs_inode.c 7.48
SCCS-vsn: sys/ufs/lfs/lfs_extern.h 7.3
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.43
SCCS-vsn: sys/ufs/ffs/ffs_extern.h 7.3

diff --git a/usr/src/sys/ufs/ffs/ffs_extern.h b/usr/src/sys/ufs/ffs/ffs_extern.h
index edfb173..9110979 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_extern.h
+++ b/usr/src/sys/ufs/ffs/ffs_extern.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_extern.h        7.2 (Berkeley) %G%
+ *     @(#)ffs_extern.h        7.3 (Berkeley) %G%

  */
 
 struct buf;
  */
 
 struct buf;


@@ -66,3 +66,10 @@ __END_DECLS
 
 extern int inside[], around[];
 extern u_char *fragtbl[];
 
 extern int inside[], around[];
 extern u_char *fragtbl[];

+extern struct vnodeops ffs_vnodeops, ffs_specops;
+#ifdef FIFO
+extern struct vnodeops ffs_fifoops;
+#define FFS_FIFOOPS &ffs_fifoops
+#else
+#define FFS_FIFOOPS NULL
+#endif

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index 46899e7..6a6fabd 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_inode.c 7.42 (Berkeley) %G%
+ *     @(#)ffs_inode.c 7.43 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -47,7 +47,6 @@ ffs_vget(mntp, ino, vpp)
        ino_t ino;
        struct vnode **vpp;
 {
        ino_t ino;
        struct vnode **vpp;
 {

-       extern struct vnodeops ffs_vnodeops, ffs_specops, ffs_fifoops;

        register struct fs *fs;
        register struct inode *ip;
        struct ufsmount *ump;
        register struct fs *fs;
        register struct inode *ip;
        struct ufsmount *ump;


@@ -117,7 +116,7 @@ ffs_vget(mntp, ino, vpp)
         * Initialize the vnode from the inode, check for aliases.  In all
         * cases re-init ip, the underlying vnode/inode may have changed.
         */
         * Initialize the vnode from the inode, check for aliases.  In all
         * cases re-init ip, the underlying vnode/inode may have changed.
         */

-       if (error = ufs_vinit(mntp, &ffs_specops, &ffs_fifoops, &vp)) {
+       if (error = ufs_vinit(mntp, &ffs_specops, FFS_FIFOOPS, &vp)) {

                ufs_iput(ip);
                *vpp = NULL;
                return (error);
                ufs_iput(ip);
                *vpp = NULL;
                return (error);

diff --git a/usr/src/sys/ufs/lfs/lfs_extern.h b/usr/src/sys/ufs/lfs/lfs_extern.h
index bcb32d6..6392df7 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_extern.h
+++ b/usr/src/sys/ufs/lfs/lfs_extern.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_extern.h        7.2 (Berkeley) %G%
+ *     @(#)lfs_extern.h        7.3 (Berkeley) %G%

  */
 
 struct fid;
  */
 
 struct fid;


@@ -54,3 +54,10 @@ int  lfs_umountdebug __P((struct mount *));
 int    lfs_vinvalbuf __P((struct vnode *));
 #endif
 __END_DECLS
 int    lfs_vinvalbuf __P((struct vnode *));
 #endif
 __END_DECLS

+extern struct vnodeops lfs_vnodeops, lfs_specops;
+#ifdef FIFO
+extern struct vnodeops lfs_fifoops;
+#define LFS_FIFOOPS &lfs_fifoops
+#else
+#define LFS_FIFOOPS NULL
+#endif

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index eb14eae..8a135a8 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_inode.c 7.47 (Berkeley) %G%
+ *     @(#)lfs_inode.c 7.48 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -49,7 +49,6 @@ lfs_vget(mntp, ino, vpp)
        struct ufsmount *ump;
        dev_t dev;
        int error;
        struct ufsmount *ump;
        dev_t dev;
        int error;

-       extern struct vnodeops lfs_fifoops, lfs_specops;

 
        ump = VFSTOUFS(mntp);
        dev = ump->um_dev;
 
        ump = VFSTOUFS(mntp);
        dev = ump->um_dev;


@@ -96,7 +95,7 @@ lfs_vget(mntp, ino, vpp)
         * Initialize the vnode from the inode, check for aliases.  In all
         * cases re-init ip, the underlying vnode/inode may have changed.
         */
         * Initialize the vnode from the inode, check for aliases.  In all
         * cases re-init ip, the underlying vnode/inode may have changed.
         */

-       if (error = ufs_vinit(mntp, &lfs_specops, &lfs_fifoops, &vp)) {
+       if (error = ufs_vinit(mntp, &lfs_specops, LFS_FIFOOPS, &vp)) {

                ufs_iput(ip);
                *vpp = NULL;
                return (error);
                ufs_iput(ip);
                *vpp = NULL;
                return (error);