From aa250f320be0fb5ce2ad992ca08e11beaea31e26 Mon Sep 17 00:00:00 2001
From: Bill Joy <wnj@ucbvax.Berkeley.EDU>
Date: Tue, 17 Feb 1981 04:51:35 -0800
Subject: [PATCH] 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
---
 usr/src/sys/kern/vfs_syscalls.c | 4 ++--
 usr/src/sys/ufs/ffs/ffs_vnops.c | 4 ++--
 usr/src/sys/ufs/ffs/ufs_vnops.c | 4 ++--
 usr/src/sys/ufs/lfs/lfs_vnops.c | 4 ++--
 usr/src/sys/ufs/ufs/ufs_vnops.c | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index cf2a0aa59a..799ec1b5e3 100644
--- 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"
@@ -244,8 +244,8 @@ found:
 	flag = !bp->b_un.b_filsys->s_ronly;
 	mp->m_bufp = NULL;
 	brelse(bp);
+	mpurge(mp - &mount[0]);
 	if (!stillopen) {
-		mpurge(mp - &mount[0]);
 		(*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 acaed53f66..3f5472300a 100644
--- 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"
@@ -244,8 +244,8 @@ found:
 	flag = !bp->b_un.b_filsys->s_ronly;
 	mp->m_bufp = NULL;
 	brelse(bp);
+	mpurge(mp - &mount[0]);
 	if (!stillopen) {
-		mpurge(mp - &mount[0]);
 		(*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 d009cd228e..6b3892b790 100644
--- 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"
@@ -244,8 +244,8 @@ found:
 	flag = !bp->b_un.b_filsys->s_ronly;
 	mp->m_bufp = NULL;
 	brelse(bp);
+	mpurge(mp - &mount[0]);
 	if (!stillopen) {
-		mpurge(mp - &mount[0]);
 		(*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 e040f736d0..424edd39e7 100644
--- 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"
@@ -244,8 +244,8 @@ found:
 	flag = !bp->b_un.b_filsys->s_ronly;
 	mp->m_bufp = NULL;
 	brelse(bp);
+	mpurge(mp - &mount[0]);
 	if (!stillopen) {
-		mpurge(mp - &mount[0]);
 		(*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 d009cd228e..6b3892b790 100644
--- 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"
@@ -244,8 +244,8 @@ found:
 	flag = !bp->b_un.b_filsys->s_ronly;
 	mp->m_bufp = NULL;
 	brelse(bp);
+	mpurge(mp - &mount[0]);
 	if (!stillopen) {
-		mpurge(mp - &mount[0]);
 		(*bdevsw[major(dev)].d_close)(dev, flag);
 		binval(dev);
 	}
-- 
2.20.1