Module Name: src
Committed By: yamt
Date: Thu Jul 16 16:32:03 UTC 2009
Modified Files:
src/sys/nfs [yamt-nfs-mp]: nfs_iod.c
Log Message:
fix a merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/nfs/nfs_iod.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/nfs/nfs_iod.c
diff -u src/sys/nfs/nfs_iod.c:1.3.2.2 src/sys/nfs/nfs_iod.c:1.3.2.3
--- src/sys/nfs/nfs_iod.c:1.3.2.2 Mon May 4 08:14:22 2009
+++ src/sys/nfs/nfs_iod.c Thu Jul 16 16:32:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_iod.c,v 1.3.2.2 2009/05/04 08:14:22 yamt Exp $ */
+/* $NetBSD: nfs_iod.c,v 1.3.2.3 2009/07/16 16:32:03 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_iod.c,v 1.3.2.2 2009/05/04 08:14:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_iod.c,v 1.3.2.3 2009/07/16 16:32:03 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,9 +154,7 @@
cv_broadcast(&nmp->nm_aiocv);
}
mutex_exit(&nmp->nm_lock);
- KERNEL_LOCK(1, curlwp);
(void)nfs_doio(bp);
- KERNEL_UNLOCK_LAST(curlwp);
mutex_enter(&nmp->nm_lock);
/*
* If there are more than one iod on this mount,
