projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix placement of mpurge bug
[unix-history]
/
usr
/
src
/
sys
/
kern
/
vfs_syscalls.c
diff --git
a/usr/src/sys/kern/vfs_syscalls.c
b/usr/src/sys/kern/vfs_syscalls.c
index
ee5d28b
..
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
3.5
%G% */
+/* vfs_syscalls.c
4.6
%G% */
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
@@
-181,9
+181,9
@@
smount()
}
mp->m_inodp = ip;
mp->m_dev = dev;
}
mp->m_inodp = ip;
mp->m_dev = dev;
-
mp->m_bufp = geteblk()
;
-
bcopy((caddr_t)bp->b_un.b_addr, mp->m_bufp->b_un.b_addr, BSIZE)
;
- fp =
mp->m_buf
p->b_un.b_filsys;
+
bp->b_flags |= B_LOCKED
;
+
mp->m_bufp = bp
;
+ fp =
b
p->b_un.b_filsys;
fp->s_ilock = 0;
fp->s_flock = 0;
fp->s_ronly = uap->ronly & 1;
fp->s_ilock = 0;
fp->s_flock = 0;
fp->s_ronly = uap->ronly & 1;
@@
-209,6
+209,7
@@
sumount()
register struct inode *ip;
register struct mount *mp;
struct buf *bp;
register struct inode *ip;
register struct mount *mp;
struct buf *bp;
+ int stillopen, flag;
register struct a {
char *fspec;
};
register struct a {
char *fspec;
};
@@
-225,20
+226,29
@@
sumount()
return;
found:
return;
found:
+ stillopen = 0;
for(ip = &inode[0]; ip < &inode[NINODE]; ip++)
for(ip = &inode[0]; ip < &inode[NINODE]; ip++)
- if(ip->i_number != 0 && dev == ip->i_dev) {
+ if
(ip->i_number != 0 && dev == ip->i_dev) {
u.u_error = EBUSY;
return;
u.u_error = EBUSY;
return;
- }
- mpurge(mp - &mount[0]);
-
(*bdevsw[major(dev)].d_close)(dev, 0)
;
+ }
else if (ip->i_number != 0 && (ip->i_mode&IFMT) == IFBLK &&
+ ip->i_un.i_rdev == dev)
+
stillopen++
;
ip = mp->m_inodp;
ip->i_flag &= ~IMOUNT;
plock(ip);
iput(ip);
ip = mp->m_inodp;
ip->i_flag &= ~IMOUNT;
plock(ip);
iput(ip);
- bp = mp->m_bufp;
+ if ((bp = getblk(dev, SUPERB)) != mp->m_bufp)
+ panic("umount");
+ bp->b_flags &= ~B_LOCKED;
+ flag = !bp->b_un.b_filsys->s_ronly;
mp->m_bufp = NULL;
brelse(bp);
mp->m_bufp = NULL;
brelse(bp);
+ mpurge(mp - &mount[0]);
+ if (!stillopen) {
+ (*bdevsw[major(dev)].d_close)(dev, flag);
+ binval(dev);
+ }
}
/*
}
/*
@@
-252,10
+262,8
@@
getmdev()
dev_t dev;
register struct inode *ip;
dev_t dev;
register struct inode *ip;
-#ifdef UCB
if (!suser())
return(NODEV);
if (!suser())
return(NODEV);
-#endif
ip = namei(uchar, 0);
if(ip == NULL)
return(NODEV);
ip = namei(uchar, 0);
if(ip == NULL)
return(NODEV);