allow multiple memory based file systems

SCCS-vsn: sys/ufs/mfs/mfs_vfsops.c 7.2
SCCS-vsn: sys/ufs/mfs/mfs_vnops.c 7.2

diff --git a/usr/src/sys/ufs/mfs/mfs_vfsops.c b/usr/src/sys/ufs/mfs/mfs_vfsops.c
index f10df1e..f34354a 100644 (file)
--- a/usr/src/sys/ufs/mfs/mfs_vfsops.c
+++ b/usr/src/sys/ufs/mfs/mfs_vfsops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)mfs_vfsops.c        7.1 (Berkeley) %G%
+ *     @(#)mfs_vfsops.c        7.2 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -26,7 +26,6 @@
 #include "../ufs/inode.h"
 #include "../ufs/fs.h"
 
 #include "../ufs/inode.h"
 #include "../ufs/fs.h"
 

-extern int mfs_running;                        /* 1 => daemon has started running */

 extern struct vnodeops mfs_vnodeops;
 
 /*
 extern struct vnodeops mfs_vnodeops;
 
 /*


@@ -111,7 +110,6 @@ mfs_start(mp, flags)
        register struct buf *bp;
        register caddr_t base;
 
        register struct buf *bp;
        register caddr_t base;
 

-       mfs_running++;

        sleep((caddr_t)vp, PRIBIO);
        base = (caddr_t)ip->i_diroff;
        while (bp = (struct buf *)ip->i_spare[0]) {
        sleep((caddr_t)vp, PRIBIO);
        base = (caddr_t)ip->i_diroff;
        while (bp = (struct buf *)ip->i_spare[0]) {

diff --git a/usr/src/sys/ufs/mfs/mfs_vnops.c b/usr/src/sys/ufs/mfs/mfs_vnops.c
index a45b4e4..cf4390d 100644 (file)
--- a/usr/src/sys/ufs/mfs/mfs_vnops.c
+++ b/usr/src/sys/ufs/mfs/mfs_vnops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)mfs_vnops.c 7.1 (Berkeley) %G%
+ *     @(#)mfs_vnops.c 7.2 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -31,7 +31,6 @@
 #include "../machine/pte.h"
 #include "../machine/mtpr.h"
 
 #include "../machine/pte.h"
 #include "../machine/mtpr.h"
 

-int mfs_running;               /* 1 => daemon has started running */

 static int mfsmap_want;                /* 1 => need kernel I/O resources */
 struct map mfsmap[MFS_MAPSIZE];
 extern char mfsiobuf[];
 static int mfsmap_want;                /* 1 => need kernel I/O resources */
 struct map mfsmap[MFS_MAPSIZE];
 extern char mfsiobuf[];


@@ -125,7 +124,7 @@ mfs_strategy(bp)
        int error;
 
        ILOCK(ip);
        int error;
 
        ILOCK(ip);

-       if (!mfs_running) {
+       if (bp->b_vp->v_mount == NULL) {

                mfs_doio(bp, (caddr_t)ip->i_diroff);
        } else {
                ip->i_spare[0] = (long)bp;
                mfs_doio(bp, (caddr_t)ip->i_diroff);
        } else {
                ip->i_spare[0] = (long)bp;