Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev Call VOP_UNLOCK() in the case where VND_COMPRESSION ...



details:   https://anonhg.NetBSD.org/src/rev/8633c8016a67
branches:  trunk
changeset: 583664:8633c8016a67
user:      nathanw <nathanw%NetBSD.org@localhost>
date:      Thu Aug 18 22:06:25 2005 +0000

description:
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 c1fb6297c4f4 -r 8633c8016a67 sys/dev/vnd.c
--- a/sys/dev/vnd.c     Thu Aug 18 21:58:59 2005 +0000
+++ b/sys/dev/vnd.c     Thu Aug 18 22:06:25 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnd.c,v 1.118 2005/07/25 13:25:08 drochner Exp $       */
+/*     $NetBSD: vnd.c,v 1.119 2005/08/18 22:06:25 nathanw 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.118 2005/07/25 13:25:08 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.119 2005/08/18 22:06:25 nathanw Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "fs_nfs.h"
@@ -987,6 +987,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 */



Home | Main Index | Thread Index | Old Index