first cached version

SCCS-vsn: sys/kern/init_main.c 3.7
SCCS-vsn: sys/kern/vfs_syscalls.c 3.4
SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 3.4
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 3.4
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 3.4
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 3.4

diff --git a/usr/src/sys/kern/init_main.c b/usr/src/sys/kern/init_main.c
index 78338a3..522cdda 100644 (file)
--- a/usr/src/sys/kern/init_main.c
+++ b/usr/src/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*     init_main.c     3.6     %G%     */
+/*     init_main.c     3.7     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -17,6 +17,7 @@
 #include "../h/clock.h"
 #include "../h/vm.h"
 #include "../h/cmap.h"
 #include "../h/clock.h"
 #include "../h/vm.h"
 #include "../h/cmap.h"

+#include "../h/text.h"

 
 /*
  * Initialization code.
 
 /*
  * Initialization code.


@@ -105,6 +106,7 @@ main(firstaddr)
        proc[0].p_szpt = CLSIZE;
        if (newproc(0)) {
                expand(clrnd((int)btoc(szicode)), P0BR);
        proc[0].p_szpt = CLSIZE;
        if (newproc(0)) {
                expand(clrnd((int)btoc(szicode)), P0BR);

+               swpexpand(u.u_dsize, 0, &u.u_dmap, &u.u_smap);

                (void) copyout((caddr_t)icode, (caddr_t)0, (unsigned)szicode);
                /*
                 * Return goes to loc. 0 of user init
                (void) copyout((caddr_t)icode, (caddr_t)0, (unsigned)szicode);
                /*
                 * Return goes to loc. 0 of user init

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index 7488898..9a12bc6 100644 (file)
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*     vfs_syscalls.c  3.3     %G%     */
+/*     vfs_syscalls.c  3.4     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -230,6 +230,7 @@ found:
                        u.u_error = EBUSY;
                        return;
                }
                        u.u_error = EBUSY;
                        return;
                }

+       mpurge(mp - &mount[0]);

        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;
        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index c4103eb..8778a5f 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -1,4 +1,4 @@
-/*     ffs_vnops.c     3.3     %G%     */
+/*     ffs_vnops.c     3.4     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -230,6 +230,7 @@ found:
                        u.u_error = EBUSY;
                        return;
                }
                        u.u_error = EBUSY;
                        return;
                }

+       mpurge(mp - &mount[0]);

        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;
        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index d1a4aec..fb00bab 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*     ufs_vnops.c     3.3     %G%     */
+/*     ufs_vnops.c     3.4     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -230,6 +230,7 @@ found:
                        u.u_error = EBUSY;
                        return;
                }
                        u.u_error = EBUSY;
                        return;
                }

+       mpurge(mp - &mount[0]);

        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;
        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index 8d96e8c..74edcdc 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -1,4 +1,4 @@
-/*     lfs_vnops.c     3.3     %G%     */
+/*     lfs_vnops.c     3.4     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -230,6 +230,7 @@ found:
                        u.u_error = EBUSY;
                        return;
                }
                        u.u_error = EBUSY;
                        return;
                }

+       mpurge(mp - &mount[0]);

        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;
        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index d1a4aec..fb00bab 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*     ufs_vnops.c     3.3     %G%     */
+/*     ufs_vnops.c     3.4     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -230,6 +230,7 @@ found:
                        u.u_error = EBUSY;
                        return;
                }
                        u.u_error = EBUSY;
                        return;
                }

+       mpurge(mp - &mount[0]);

        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;
        (*bdevsw[major(dev)].d_close)(dev, 0);
        ip = mp->m_inodp;
        ip->i_flag &= ~IMOUNT;