CVS commit: src/sys/dev

[Andrew Doran]

Module Name:    src
Committed By:   ad
Date:           Wed May  6 22:38:42 UTC 2009

Modified Files:
        src/sys/dev: vnd.c

Log Message:
Unneeded LK_CANRECURSE.


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/dev/vnd.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/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.199 src/sys/dev/vnd.c:1.200
--- src/sys/dev/vnd.c:1.199	Thu Apr 30 20:34:08 2009
+++ src/sys/dev/vnd.c	Wed May  6 22:38:42 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.199 2009/04/30 20:34:08 dyoung Exp $	*/
+/*	$NetBSD: vnd.c,v 1.200 2009/05/06 22:38:42 ad Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.199 2009/04/30 20:34:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.200 2009/05/06 22:38:42 ad Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "fs_nfs.h"
@@ -567,7 +567,7 @@
 	 * physical block number.
 	 */
 	error = 0;
-	vn_lock(vnd->sc_vp, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE);
+	vn_lock(vnd->sc_vp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_BMAP(vnd->sc_vp, 0, NULL, &nbn, NULL);
 	VOP_UNLOCK(vnd->sc_vp, 0);
 
@@ -811,7 +811,7 @@
 		int off, nra;
 
 		nra = 0;
-		vn_lock(vnd->sc_vp, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE);
+		vn_lock(vnd->sc_vp, LK_EXCLUSIVE | LK_RETRY);
 		error = VOP_BMAP(vnd->sc_vp, bn / bsize, &vp, &nbn, &nra);
 		VOP_UNLOCK(vnd->sc_vp, 0);