[src/netbsd-7]: src/sys/fs/smbfs Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/58c3a336b738
branches:  netbsd-7
changeset: 798515:58c3a336b738
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Nov 09 14:50:23 2014 +0000

description:
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.

diffstat:

 sys/fs/smbfs/smbfs_vnops.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r ca997957b90e -r 58c3a336b738 sys/fs/smbfs/smbfs_vnops.c
--- a/sys/fs/smbfs/smbfs_vnops.c        Sun Nov 09 14:42:33 2014 +0000
+++ b/sys/fs/smbfs/smbfs_vnops.c        Sun Nov 09 14:50:23 2014 +0000
@@ -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 @@
                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 @@
                else if (error == 0
                        && vattr.va_ctime.tv_sec == VTOSMB(newvp)->n_ctime)
                {
+                       if (newvp != dvp)
+                               VOP_UNLOCK(newvp);
                        /* nfsstats.lookupcache_hits++; */
                        return (0);
                }