Module Name: src
Committed By: dyoung
Date: Sun May 17 18:11:34 UTC 2009
Modified Files:
src/sys/dev/scsipi: sd.c
Log Message:
Reverse the sense of the DETACH_FORCE check so that we return EBUSY in
the correct circumstances.
To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/sys/dev/scsipi/sd.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/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.282 src/sys/dev/scsipi/sd.c:1.283
--- src/sys/dev/scsipi/sd.c:1.282 Sat May 16 20:10:52 2009
+++ src/sys/dev/scsipi/sd.c Sun May 17 18:11:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.282 2009/05/16 20:10:52 dyoung Exp $ */
+/* $NetBSD: sd.c,v 1.283 2009/05/17 18:11:34 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.282 2009/05/16 20:10:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.283 2009/05/17 18:11:34 dyoung Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -356,7 +356,7 @@
mutex_enter(&sd->sc_dk.dk_openlock);
if (sd->sc_dk.dk_openmask == 0)
; /* nothing to do */
- else if ((flags & DETACH_FORCE) != 0)
+ else if ((flags & DETACH_FORCE) == 0)
rc = EBUSY;
else
sdlastclose(sd);