[src/netbsd-3]: src/sys/dev Pull up following revision(s) (requested by xtrae...

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

details:   https://anonhg.NetBSD.org/src/rev/7f5ae6b2c66d
branches:  netbsd-3
changeset: 577324:7f5ae6b2c66d
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Oct 07 11:47:40 2005 +0000

description:
Pull up following revision(s) (requested by xtraeme in ticket #867):
        sys/dev/vnd.c: revision 1.119
Call VOP_UNLOCK() in the case where VND_COMPRESSION isn't defined and
we're about to return EOPNOTSUPP. Prevents a "locking against myself"
panic in vn_close() in the error return path.
Addresses PR# kern/30958

diffstat:

 sys/dev/vnd.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 7ac70794ba66 -r 7f5ae6b2c66d sys/dev/vnd.c
--- a/sys/dev/vnd.c     Fri Oct 07 11:41:38 2005 +0000
+++ b/sys/dev/vnd.c     Fri Oct 07 11:47:40 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnd.c,v 1.111.10.4 2005/08/14 21:14:32 riz Exp $       */
+/*     $NetBSD: vnd.c,v 1.111.10.5 2005/10/07 11:47:40 tron Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.111.10.4 2005/08/14 21:14:32 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.111.10.5 2005/10/07 11:47:40 tron Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "fs_nfs.h"
@@ -992,6 +992,7 @@
  
                         vnd->sc_flags |= VNF_COMP | VNF_READONLY;
 #else /* !VND_COMPRESSION */
+                       VOP_UNLOCK(nd.ni_vp, 0);
                        error = EOPNOTSUPP;
                        goto close_and_exit;
 #endif /* VND_COMPRESSION */