CVS commit: [netbsd-5] src/sys/kern

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Wed Jul  1 22:45:03 UTC 2009

Modified Files:
        src/sys/kern [netbsd-5]: vfs_lockf.c

Log Message:
Pull up following revision(s) (requested by rmind in ticket #840):
        sys/kern/vfs_lockf.c: revision 1.70
lf_split: cv_destroy a condvar before clobbering it.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.69.4.1 src/sys/kern/vfs_lockf.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/kern/vfs_lockf.c
diff -u src/sys/kern/vfs_lockf.c:1.69 src/sys/kern/vfs_lockf.c:1.69.4.1
--- src/sys/kern/vfs_lockf.c:1.69	Sat Oct 11 13:40:57 2008
+++ src/sys/kern/vfs_lockf.c	Wed Jul  1 22:45:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_lockf.c,v 1.69 2008/10/11 13:40:57 pooka Exp $	*/
+/*	$NetBSD: vfs_lockf.c,v 1.69.4.1 2009/07/01 22:45:03 snj Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lockf.c,v 1.69 2008/10/11 13:40:57 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lockf.c,v 1.69.4.1 2009/07/01 22:45:03 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -383,6 +383,7 @@
 	 */
 	splitlock = *sparelock;
 	*sparelock = NULL;
+	cv_destroy(&splitlock->lf_cv);
 	memcpy(splitlock, lock1, sizeof(*splitlock));
 	cv_init(&splitlock->lf_cv, lockstr);