diff options
| author | John Dyson <dyson@FreeBSD.org> | 1997-10-06 02:38:30 +0000 |
|---|---|---|
| committer | John Dyson <dyson@FreeBSD.org> | 1997-10-06 02:38:30 +0000 |
| commit | e7b0208f615e39d3dbf5e4f2f0522a219aea4f73 (patch) | |
| tree | 33e56e160cb8c2913941fe4c48f039140c983996 /sys | |
| parent | 42c0de49268d3322c3b968948afa9a8a3cd768a1 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/vfs_vnops.c | 6 | ||||
| -rw-r--r-- | sys/vm/vnode_pager.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index bf04c325bbb1..1117ef5ff3d3 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $Id: vfs_vnops.c,v 1.37 1997/09/02 20:06:04 bde Exp $ + * $Id: vfs_vnops.c,v 1.38 1997/09/14 02:51:16 peter Exp $ */ #include <sys/param.h> @@ -275,7 +275,7 @@ vn_read(fp, uio, cred) int flag, seq; VOP_LEASE(vp, p, cred, LEASE_READ); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, LK_SHARED | LK_NOPAUSE | LK_RETRY, p); uio->uio_offset = fp->f_offset; count = uio->uio_resid; flag = 0; @@ -525,7 +525,7 @@ vn_lock(vp, flags, p) tsleep((caddr_t)vp, PINOD, "vn_lock", 0); error = ENOENT; } else { - error = VOP_LOCK(vp, flags | LK_INTERLOCK, p); + error = VOP_LOCK(vp, flags | LK_NOPAUSE | LK_INTERLOCK, p); if (error == 0) return (error); } diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 796de50ba064..e9005a6f3ef7 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $Id: vnode_pager.c,v 1.73 1997/08/25 22:15:31 bde Exp $ + * $Id: vnode_pager.c,v 1.74 1997/09/01 03:17:34 bde Exp $ */ /* @@ -973,7 +973,8 @@ vnode_pager_lock(object) if (object->type != OBJT_VNODE) continue; - vn_lock(object->handle, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE, p); + vn_lock(object->handle, + LK_NOPAUSE | LK_SHARED | LK_RETRY | LK_CANRECURSE, p); return object->handle; } return NULL; |