[src/trunk]: src/sys/fs It makes no sense to call vget() with LK_RETRY.

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

details:   https://anonhg.NetBSD.org/src/rev/672b7b296a66
branches:  trunk
changeset: 756580:672b7b296a66
user:      hannken <hannken%NetBSD.org@localhost>
date:      Sun Jul 25 09:54:37 2010 +0000

description:
It makes no sense to call vget() with LK_RETRY.

diffstat:

 sys/fs/ntfs/ntfs_vfsops.c       |  9 ++++-----
 sys/fs/puffs/puffs_node.c       |  6 +++---
 sys/fs/sysvbfs/sysvbfs_vfsops.c |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diffs (91 lines):

diff -r fd9a42e1aa61 -r 672b7b296a66 sys/fs/ntfs/ntfs_vfsops.c
--- a/sys/fs/ntfs/ntfs_vfsops.c Sun Jul 25 07:19:00 2010 +0000
+++ b/sys/fs/ntfs/ntfs_vfsops.c Sun Jul 25 09:54:37 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntfs_vfsops.c,v 1.84 2010/07/21 17:52:10 hannken Exp $ */
+/*     $NetBSD: ntfs_vfsops.c,v 1.85 2010/07/25 09:54:37 hannken Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 Semen Ustimenko
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.84 2010/07/21 17:52:10 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.85 2010/07/25 09:54:37 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -659,7 +659,7 @@
            (unsigned long long)ntfh.ntfid_ino));
 
        error = ntfs_vgetex(mp, ntfh.ntfid_ino, ntfh.ntfid_attr, NULL,
-                       LK_EXCLUSIVE | LK_RETRY, 0, vpp);
+                       LK_EXCLUSIVE, 0, vpp);
        if (error != 0) {
                *vpp = NULLVP;
                return (error);
@@ -848,8 +848,7 @@
        ino_t ino,
        struct vnode **vpp)
 {
-       return ntfs_vgetex(mp, ino, NTFS_A_DATA, NULL,
-                       LK_EXCLUSIVE | LK_RETRY, 0, vpp);
+       return ntfs_vgetex(mp, ino, NTFS_A_DATA, NULL, LK_EXCLUSIVE, 0, vpp);
 }
 
 extern const struct vnodeopv_desc ntfs_vnodeop_opv_desc;
diff -r fd9a42e1aa61 -r 672b7b296a66 sys/fs/puffs/puffs_node.c
--- a/sys/fs/puffs/puffs_node.c Sun Jul 25 07:19:00 2010 +0000
+++ b/sys/fs/puffs/puffs_node.c Sun Jul 25 09:54:37 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs_node.c,v 1.16 2010/07/21 17:52:10 hannken Exp $  */
+/*     $NetBSD: puffs_node.c,v 1.17 2010/07/25 10:03:59 hannken Exp $  */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.16 2010/07/21 17:52:10 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.17 2010/07/25 10:03:59 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/hash.h>
@@ -399,7 +399,7 @@
 
        vgetflags = 0;
        if (lock)
-               vgetflags |= LK_EXCLUSIVE | LK_RETRY;
+               vgetflags |= LK_EXCLUSIVE;
        if ((rv = vget(vp, vgetflags)))
                return rv;
 
diff -r fd9a42e1aa61 -r 672b7b296a66 sys/fs/sysvbfs/sysvbfs_vfsops.c
--- a/sys/fs/sysvbfs/sysvbfs_vfsops.c   Sun Jul 25 07:19:00 2010 +0000
+++ b/sys/fs/sysvbfs/sysvbfs_vfsops.c   Sun Jul 25 09:54:37 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysvbfs_vfsops.c,v 1.34 2010/07/21 17:52:11 hannken Exp $      */
+/*     $NetBSD: sysvbfs_vfsops.c,v 1.35 2010/07/25 10:00:48 hannken Exp $      */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.34 2010/07/21 17:52:11 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vfsops.c,v 1.35 2010/07/25 10:00:48 hannken Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -353,7 +353,7 @@
                        vp = bnode->vnode;
                        mutex_enter(&vp->v_interlock);
                        mutex_exit(&mntvnode_lock);
-                       if (vget(vp, LK_EXCLUSIVE | LK_RETRY) == 0) {
+                       if (vget(vp, LK_EXCLUSIVE) == 0) {
                                *vpp = vp;
                                return 0;
                        } else {