CVS commit: [netbsd-5] src/sys/fs/puffs

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Wed Jan 25 20:51:15 UTC 2012

Modified Files:
        src/sys/fs/puffs [netbsd-5]: puffs_node.c

Log Message:
Pull up following revision(s) (requested by manu in ticket #1714):
        sys/fs/puffs/puffs_node.c: revision 1.23
Fix a race condition where the filesystem lookups a vnode that is
being recycled, producing ENOENT while the file does exist.
Approved by yamt


To generate a diff of this commit:
cvs rdiff -u -r1.13.10.3 -r1.13.10.4 src/sys/fs/puffs/puffs_node.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/fs/puffs/puffs_node.c
diff -u src/sys/fs/puffs/puffs_node.c:1.13.10.3 src/sys/fs/puffs/puffs_node.c:1.13.10.4
--- src/sys/fs/puffs/puffs_node.c:1.13.10.3	Wed Nov  2 20:11:12 2011
+++ src/sys/fs/puffs/puffs_node.c	Wed Jan 25 20:51:15 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_node.c,v 1.13.10.3 2011/11/02 20:11:12 riz Exp $	*/
+/*	$NetBSD: puffs_node.c,v 1.13.10.4 2012/01/25 20:51:15 riz 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.13.10.3 2011/11/02 20:11:12 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.13.10.4 2012/01/25 20:51:15 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/hash.h>
@@ -321,8 +321,14 @@ puffs_makeroot(struct puffs_mount *pmp)
 	if (vp) {
 		mutex_enter(&vp->v_interlock);
 		mutex_exit(&pmp->pmp_lock);
-		if (vget(vp, LK_INTERLOCK) == 0)
+		switch (vget(vp, LK_INTERLOCK)) {
+		case ENOENT:
+			goto retry;
+		case 0:
 			return 0;
+		default:
+			break;
+		}
 	} else
 		mutex_exit(&pmp->pmp_lock);
 
@@ -387,6 +393,7 @@ puffs_cookie2vnode(struct puffs_mount *p
 		return 0;
 	}
 
+ retry:
 	mutex_enter(&pmp->pmp_lock);
 	pnode = puffs_cookie2pnode(pmp, ck);
 	if (pnode == NULL) {
@@ -406,8 +413,14 @@ puffs_cookie2vnode(struct puffs_mount *p
 	vgetflags = LK_INTERLOCK;
 	if (lock)
 		vgetflags |= LK_EXCLUSIVE | LK_RETRY;
-	if ((rv = vget(vp, vgetflags)))
+	switch (rv = vget(vp, vgetflags)) {
+	case ENOENT:
+		goto retry;
+	case 0:
+		break;
+	default:
 		return rv;
+	}
 
 	*vpp = vp;
 	return 0;