[src/trunk]: src/sys/kern vn_lock: don't pass LK_RETRY to VOP_LOCK.

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/00a7cdf1fd7e
branches:  trunk
changeset: 567061:00a7cdf1fd7e
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sun May 30 20:48:04 2004 +0000

description:
vn_lock: don't pass LK_RETRY to VOP_LOCK.

diffstat:

 sys/kern/vfs_vnops.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 33fdbc5480d8 -r 00a7cdf1fd7e sys/kern/vfs_vnops.c
--- a/sys/kern/vfs_vnops.c      Sun May 30 20:46:25 2004 +0000
+++ b/sys/kern/vfs_vnops.c      Sun May 30 20:48:04 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_vnops.c,v 1.78 2004/05/25 14:54:57 hannken Exp $   */
+/*     $NetBSD: vfs_vnops.c,v 1.79 2004/05/30 20:48:04 yamt Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.78 2004/05/25 14:54:57 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.79 2004/05/30 20:48:04 yamt Exp $");
 
 #include "fs_union.h"
 
@@ -779,7 +779,8 @@
                            "vn_lock", 0, &vp->v_interlock);
                        error = ENOENT;
                } else {
-                       error = VOP_LOCK(vp, flags | LK_INTERLOCK);
+                       error = VOP_LOCK(vp,
+                           (flags & ~LK_RETRY) | LK_INTERLOCK);
                        if (error == 0 || error == EDEADLK || error == EBUSY)
                                return (error);
                }