Module Name: src
Committed By: martin
Date: Sun Nov 9 14:50:23 UTC 2014
Modified Files:
src/sys/fs/smbfs [netbsd-7]: smbfs_vnops.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #187):
sys/fs/smbfs/smbfs_vnops.c: revision 1.92
Fix vnode locking changes in rev.1.89:
- lock vnode by the end of cache_purge and vput.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.91.2.1 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.91 src/sys/fs/smbfs/smbfs_vnops.c:1.91.2.1
--- src/sys/fs/smbfs/smbfs_vnops.c:1.91 Fri Jul 25 08:20:52 2014
+++ src/sys/fs/smbfs/smbfs_vnops.c Sun Nov 9 14:50:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_vnops.c,v 1.91 2014/07/25 08:20:52 dholland Exp $ */
+/* $NetBSD: smbfs_vnops.c,v 1.91.2.1 2014/11/09 14:50:23 martin 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.91 2014/07/25 08:20:52 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.91.2.1 2014/11/09 14:50:23 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1249,8 +1249,6 @@ smbfs_lookup(void *v)
if (newvp != dvp)
vn_lock(newvp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(newvp, &vattr, cnp->cn_cred);
- if (newvp != dvp)
- VOP_UNLOCK(newvp);
/*
* If the file type on the server is inconsistent
* with what it was when we created the vnode,
@@ -1267,6 +1265,8 @@ smbfs_lookup(void *v)
else if (error == 0
&& vattr.va_ctime.tv_sec == VTOSMB(newvp)->n_ctime)
{
+ if (newvp != dvp)
+ VOP_UNLOCK(newvp);
/* nfsstats.lookupcache_hits++; */
return (0);
}
