diff options
| author | attilio <attilio@FreeBSD.org> | 2007-12-27 20:52:05 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2007-12-27 20:52:05 +0000 |
| commit | d9b244638ead855a1ff6847b1f72eec87015d416 (patch) | |
| tree | 96d6517c6ee1d7d223df26384199ee4aad1c2b71 | |
| parent | 9adc50eb974224b029fa501a3427b9d1a755ddb0 (diff) | |
| download | FreeBSD-src-d9b244638ead855a1ff6847b1f72eec87015d416.zip FreeBSD-src-d9b244638ead855a1ff6847b1f72eec87015d416.tar.gz | |
As LK_EXCLUPGRADE is used in conjuction with LK_NOWAIT, LK_UPGRADE becames
equivalent with this and so operate the switch.
That call is the only one remaining LK_EXCLUPGRADE consumer and removing
it will prepare the ground for LK_EXCLUPGRADE axing and further
lockmgr improvements.
Discussed with: jeff, ups
| -rw-r--r-- | sys/kern/vfs_subr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index e912006..bd2ba70 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2210,7 +2210,7 @@ vput(struct vnode *vp) v_decr_useonly(vp); vp->v_iflag |= VI_OWEINACT; if (VOP_ISLOCKED(vp, NULL) != LK_EXCLUSIVE) { - error = VOP_LOCK(vp, LK_EXCLUPGRADE|LK_INTERLOCK|LK_NOWAIT, td); + error = VOP_LOCK(vp, LK_UPGRADE|LK_INTERLOCK|LK_NOWAIT, td); VI_LOCK(vp); if (error) { if (vp->v_usecount > 0) |
