fix placement of mpurge bug

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

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index cf2a0aa..799ec1b 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  4.5     %G%     */
+/*     vfs_syscalls.c  4.6     %G%     */

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


@@ -244,8 +244,8 @@ found:
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);

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

        if (!stillopen) {
        if (!stillopen) {

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

                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }
                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index acaed53..3f54723 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     4.5     %G%     */
+/*     ffs_vnops.c     4.6     %G%     */

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


@@ -244,8 +244,8 @@ found:
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);

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

        if (!stillopen) {
        if (!stillopen) {

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

                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }
                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index d009cd2..6b3892b 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     4.5     %G%     */
+/*     ufs_vnops.c     4.6     %G%     */

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


@@ -244,8 +244,8 @@ found:
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);

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

        if (!stillopen) {
        if (!stillopen) {

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

                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }
                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index e040f73..424edd3 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     4.5     %G%     */
+/*     lfs_vnops.c     4.6     %G%     */

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


@@ -244,8 +244,8 @@ found:
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);

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

        if (!stillopen) {
        if (!stillopen) {

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

                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }
                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index d009cd2..6b3892b 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     4.5     %G%     */
+/*     ufs_vnops.c     4.6     %G%     */

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


@@ -244,8 +244,8 @@ found:
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);
        flag = !bp->b_un.b_filsys->s_ronly;
        mp->m_bufp = NULL;
        brelse(bp);

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

        if (!stillopen) {
        if (!stillopen) {

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

                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }
                (*bdevsw[major(dev)].d_close)(dev, flag);
                binval(dev);
        }