Module Name: src
Committed By: yamt
Date: Mon May 4 05:59:35 UTC 2009
Modified Files:
src/sys/nfs: nfs_vnops.c
Log Message:
nfs_lookup: handle the case where the vnode returned cache_lookup_raw is
being reclaimed by another thread. after recent changes in cache_lookup_raw,
there's a race between cache_lookup_raw/vtryget and getcleanvnode/vclean.
PR/41028.
To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 src/sys/nfs/nfs_vnops.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/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.275 src/sys/nfs/nfs_vnops.c:1.276
--- src/sys/nfs/nfs_vnops.c:1.275 Mon May 4 05:50:17 2009
+++ src/sys/nfs/nfs_vnops.c Mon May 4 05:59:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.275 2009/05/04 05:50:17 yamt Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.276 2009/05/04 05:59:35 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.275 2009/05/04 05:50:17 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.276 2009/05/04 05:59:35 yamt Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -867,11 +867,9 @@
if ((flags & ISDOTDOT) != 0) {
vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
}
- if (error) {
+ if (error != 0) {
/* newvp has been revoked. */
- vrele(newvp);
- *vpp = NULL;
- return error;
+ goto dorpc;
}
if (cnp->cn_nameiop != LOOKUP && (flags & ISLASTCN))
cnp->cn_flags |= SAVENAME;
