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
allocate ports
[unix-history]
/
usr
/
src
/
sys
/
ufs
/
lfs
/
lfs_vnops.c
diff --git
a/usr/src/sys/ufs/lfs/lfs_vnops.c
b/usr/src/sys/ufs/lfs/lfs_vnops.c
index
74edcdc
..
529fc0e
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.4 %G%
*/
+/* lfs_vnops.c
4.9 81/03/09
*/
#include "../h/param.h"
#include "../h/systm.h"
#include "../h/param.h"
#include "../h/systm.h"
@@
-65,7
+65,7
@@
off_t pipeadj;
register struct buf *bp;
struct stat ds;
register struct buf *bp;
struct stat ds;
- IUPDAT(ip, &time, &time);
+ IUPDAT(ip, &time, &time
, 0
);
/*
* first copy from inode table
*/
/*
* first copy from inode table
*/
@@
-135,8
+135,7
@@
dup()
/*
* the mount system call.
*/
/*
* the mount system call.
*/
-smount()
-{
+smount() {
dev_t dev;
register struct inode *ip;
register struct mount *mp;
dev_t dev;
register struct inode *ip;
register struct mount *mp;
@@
-148,6
+147,7
@@
smount()
char *freg;
int ronly;
} *uap;
char *freg;
int ronly;
} *uap;
+ register char *cp;
uap = (struct a *)u.u_ap;
dev = getmdev();
uap = (struct a *)u.u_ap;
dev = getmdev();
@@
-181,14
+181,19
@@
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_nbehind = 0;
fp->s_lasti = 1;
fp->s_ilock = 0;
fp->s_flock = 0;
fp->s_ronly = uap->ronly & 1;
fp->s_nbehind = 0;
fp->s_lasti = 1;
+ u.u_dirp = uap->freg;
+ for (cp = fp->s_fsmnt; cp < &fp->s_fsmnt[sizeof (fp->s_fsmnt) - 1]; )
+ if ((*cp++ = uchar()) == 0)
+ u.u_dirp--; /* get 0 again */
+ *cp = 0;
brelse(bp);
ip->i_flag |= IMOUNT;
prele(ip);
brelse(bp);
ip->i_flag |= IMOUNT;
prele(ip);
@@
-209,6
+214,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
+231,29
@@
sumount()
return;
found:
return;
found:
- for(ip = &inode[0]; ip < &inode[NINODE]; ip++)
- if(ip->i_number != 0 && dev == ip->i_dev) {
+ stillopen = 0;
+ for(ip = inode; ip < inodeNINODE; ip++)
+ 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
+267,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);