From d1a8a81d20fc15b8e63a1ae14acec64e1683525e Mon Sep 17 00:00:00 2001
From: Mark Buechler <mark.buechler@gmail.com>
Date: Wed, 20 Jun 2007 13:45:19 +0000
Subject: [PATCH] - Fixed closing a device with -RemoveDev - Added BLOCKIO
 option support

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@131 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/SCST/SCST.pm | 5 +++--
 scstadmin/scstadmin    | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scstadmin/SCST/SCST.pm b/scstadmin/SCST/SCST.pm
index c04788ffa..c947a8f2f 100644
--- a/scstadmin/SCST/SCST.pm
+++ b/scstadmin/SCST/SCST.pm
@@ -32,7 +32,8 @@ my $_SCST_VERSION_IO_    = $_SCST_DIR_.'/version';
 my $_SCST_USERS_IO_      = 'names';
 my $_SCST_DEVICES_IO_    = 'devices';
 
-my @_AVAILABLE_OPTIONS_  = ('WRITE_THROUGH', 'O_DIRECT', 'READ_ONLY', 'NULLIO', 'NV_CACHE');
+my @_AVAILABLE_OPTIONS_  = ('WRITE_THROUGH', 'O_DIRECT', 'READ_ONLY',
+			    'NULLIO', 'NV_CACHE', 'BLOCKIO');
 
 use vars qw(@ISA @EXPORT $VERSION $CDROM_TYPE $CHANGER_TYPE $DISK_TYPE $VDISK_TYPE
             $VCDROM_TYPE $DISKPERF_TYPE $MODISK_TYPE $MODISKPERF_TYPE $TAPE_TYPE
@@ -437,7 +438,7 @@ sub closeDevice {
 		return $TRUE;
 	}
 
-	if ($self->handlerDeviceExists($handler, $device)) {
+	if (!$self->handlerDeviceExists($handler, $device)) {
 		$self->{'error'} = "closeDevice(): Device $device is not open";
 		return 2;
 	}
diff --git a/scstadmin/scstadmin b/scstadmin/scstadmin
index 0420a4fe0..57d98ade8 100755
--- a/scstadmin/scstadmin
+++ b/scstadmin/scstadmin
@@ -62,7 +62,7 @@ Available Handlers:
       disk, vdisk, disk_perf, cdrom, vcdrom, changer, modisk, modisk_perf, tape, tape_perf
 
 Available Options for create and open:
-      WRITE_THROUGH, READ_ONLY, O_DIRECT, NULLIO, NV_CACHE
+      WRITE_THROUGH, READ_ONLY, O_DIRECT, NULLIO, NV_CACHE, BLOCKIO
      
 Examples:
      Enable target mode for fibre card specifying its WWN
@@ -256,7 +256,7 @@ sub getArgs {
 	}
 
 	if ($releaseDev && !defined($group)) {
-		print "Please specify -group with -RemoveDev.\n\n";
+		print "Please specify -group with -ReleaseDev.\n\n";
 		usage();
 	}
 
@@ -905,7 +905,7 @@ sub removeDevice {
 
 	if ($SCST->closeDevice($_handler, $device)) {
 		print "WARNING: Failed to close virtual device '$device': ".
-		  $SCST->errorString();
+		  $SCST->errorString()."\n";
 		return $TRUE;
 	}