diff options
| author | jeff <jeff@FreeBSD.org> | 2005-03-31 04:37:09 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2005-03-31 04:37:09 +0000 |
| commit | 97c40ebd4979f7f9f856c27d894bb4b0e30c5c1c (patch) | |
| tree | 562132c40ee68003362542b77c00d49ecd1e53eb /sys/kern/vfs_vnops.c | |
| parent | 902bc24bce16bbf5bba6cf96ed17073efa62568a (diff) | |
| download | FreeBSD-src-97c40ebd4979f7f9f856c27d894bb4b0e30c5c1c.zip FreeBSD-src-97c40ebd4979f7f9f856c27d894bb4b0e30c5c1c.tar.gz | |
- LK_NOPAUSE is a nop now.
Sponsored by: Isilon Systems, Inc.
Diffstat (limited to 'sys/kern/vfs_vnops.c')
| -rw-r--r-- | sys/kern/vfs_vnops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 0723a63..afdeccf 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -496,10 +496,10 @@ vn_read(fp, uio, active_cred, flags, td) * Once this field has it's own lock we can acquire this shared. */ if ((flags & FOF_OFFSET) == 0) { - vn_lock(vp, LK_EXCLUSIVE | LK_NOPAUSE | LK_RETRY, td); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); uio->uio_offset = fp->f_offset; } else - vn_lock(vp, LK_SHARED | LK_NOPAUSE | LK_RETRY, td); + vn_lock(vp, LK_SHARED | LK_RETRY, td); ioflag |= sequential_heuristic(uio, fp); @@ -811,7 +811,7 @@ debug_vn_lock(vp, flags, td, filename, line) * lockmgr drops interlock before it will return for * any reason. So force the code above to relock it. */ - error = VOP_LOCK(vp, flags | LK_NOPAUSE | LK_INTERLOCK, td); + error = VOP_LOCK(vp, flags | LK_INTERLOCK, td); flags &= ~LK_INTERLOCK; /* * Callers specify LK_RETRY if they wish to get dead vnodes. |
