d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up vn_rdwr locking.

Browse Source 
- Do shared locks on read.
 - Only do vn_{start,finished}_write when writing.
This commit is contained in:
Jeff Roberson 2002-06-28 17:51:11 +00:00
parent aac12bcfbc
commit 5c71bc6cf2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=98981
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/vfs_vnops.c
View File

@ -356,11 +356,16 @@ vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid, td)
if ((ioflg & IO_NODELOCKED) == 0) {
mp = NULL;
if (rw == UIO_WRITE &&
vp->v_type != VCHR &&
(error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
return (error);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
if (rw == UIO_WRITE) {
if (vp->v_type != VCHR &&
(error = vn_start_write(vp, &mp, V_WAIT | PCATCH))
!= 0)
return (error);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
} else {
vn_lock(vp, LK_SHARED | LK_RETRY, td);
}
}
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
@ -382,7 +387,8 @@ vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, cred, aresid, td)
if (auio.uio_resid && error == 0)
error = EIO;
if ((ioflg & IO_NODELOCKED) == 0) {
vn_finished_write(mp);
if (rw == UIO_WRITE)
vn_finished_write(mp);
VOP_UNLOCK(vp, 0, td);
}
return (error);