Module Name: src
Committed By: dyoung
Date: Fri Aug 7 00:08:07 UTC 2009
Modified Files:
src/sys/dev: vnd.c
Log Message:
Re-use DK_BUSY().
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 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.203 src/sys/dev/vnd.c:1.204
--- src/sys/dev/vnd.c:1.203 Tue Jul 7 19:51:22 2009
+++ src/sys/dev/vnd.c Fri Aug 7 00:08:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.203 2009/07/07 19:51:22 dyoung Exp $ */
+/* $NetBSD: vnd.c,v 1.204 2009/08/07 00:08:07 dyoung 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.203 2009/07/07 19:51:22 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.204 2009/08/07 00:08:07 dyoung Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
@@ -163,6 +163,7 @@
#include <miscfs/genfs/genfs.h>
#include <miscfs/specfs/specdev.h>
+#include <dev/dkvar.h>
#include <dev/vndvar.h>
#include <prop/proplib.h>
@@ -972,9 +973,7 @@
* or if both the character and block flavors of this
* partition are open.
*/
- if (((vnd->sc_dkdev.dk_openmask & ~pmask) ||
- ((vnd->sc_dkdev.dk_bopenmask & pmask) &&
- (vnd->sc_dkdev.dk_copenmask & pmask))) && !force) {
+ if (DK_BUSY(vnd, pmask) && !force) {
vndunlock(vnd);
return EBUSY;
}
