Module Name: src
Committed By: pooka
Date: Fri Apr 25 15:18:06 UTC 2014
Modified Files:
src/sys/fs/smbfs: smbfs_vnops.c
Log Message:
Don't lock an already locked vnode.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/fs/smbfs/smbfs_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/fs/smbfs/smbfs_vnops.c
diff -u src/sys/fs/smbfs/smbfs_vnops.c:1.89 src/sys/fs/smbfs/smbfs_vnops.c:1.90
--- src/sys/fs/smbfs/smbfs_vnops.c:1.89 Fri Feb 7 15:29:21 2014
+++ src/sys/fs/smbfs/smbfs_vnops.c Fri Apr 25 15:18:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_vnops.c,v 1.89 2014/02/07 15:29:21 hannken Exp $ */
+/* $NetBSD: smbfs_vnops.c,v 1.90 2014/04/25 15:18:06 pooka Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.89 2014/02/07 15:29:21 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.90 2014/04/25 15:18:06 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1244,9 +1244,11 @@ smbfs_lookup(void *v)
}
newvp = *vpp;
- vn_lock(newvp, LK_SHARED | LK_RETRY);
+ if (newvp != dvp)
+ vn_lock(newvp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(newvp, &vattr, cnp->cn_cred);
- VOP_UNLOCK(newvp);
+ if (newvp != dvp)
+ VOP_UNLOCK(newvp);
/*
* If the file type on the server is inconsistent
* with what it was when we created the vnode,
