From 2ccb2b10037162f1519814af2d07cbabc205b81a Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 7 Jan 2018 02:23:49 +0000 Subject: [PATCH 1/2] scstadmin, listExported: Remove dead code git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7333 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/scstadmin.sysfs/scstadmin | 72 ++++++++++++----------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index 470c14084..a3b1bb2c6 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -3546,56 +3546,42 @@ sub listGroups { sub listExported { my $device = shift; my $attributes = shift; - my $errorString; + my $exported = $$attributes{'exported'}->{'value'}; + my $l_driver = length('Driver'); + my $l_target = length('Target'); + my $l_group = length('Group'); - if (!$attributes) { - ($attributes, $errorString) = $SCST->deviceAttributes($device) ; - return TRUE if issueWarning($errorString); - } + foreach my $driver (keys %{$exported}) { + $l_driver = length($driver) + if (length($driver) > $l_driver); - if (keys %{$$attributes{'exported'}}) { - my $exported = $$attributes{'exported'}->{'value'}; + foreach my $target (keys %{$$exported{$driver}}) { + $l_target = length($target) + if (length($target) > $l_target); - my $l_driver = length('Driver'); - my $l_target = length('Target'); - my $l_group = length('Group'); - - foreach my $driver (keys %{$exported}) { - $l_driver = length($driver) - if (length($driver) > $l_driver); - - foreach my $target (keys %{$$exported{$driver}}) { - $l_target = length($target) - if (length($target) > $l_target); - - foreach my $group (keys %{$$exported{$driver}->{$target}}) { - $l_group = length($group) - if (length($group) > $l_group); - } + foreach my $group (keys %{$$exported{$driver}->{$target}}) { + $l_group = length($group) + if (length($group) > $l_group); } } - - print "Device '$device' is currently in use by the following:\n\n"; - printf("\t%-*s %-*s %-*s %-4s\n", $l_driver, 'Driver', $l_target, 'Target', - $l_group, 'Group', 'Lun'); - print "\t"; - print join("", "-" x ($l_driver + $l_target + $l_group + 6)); - print "\n"; - - foreach my $driver (sort keys %{$exported}) { - foreach my $target (sort keys %{$$exported{$driver}}) { - foreach my $group (sort keys %{$$exported{$driver}->{$target}}) { - my $lun = $$exported{$driver}->{$target}->{$group}; - printf("\t%-*s %-*s %-*s %-4s\n", $l_driver, $driver, - $l_target, $target, $l_group, $group, $lun); - } - } - } - } else { - print "Device '$device' is not currently in use by any group.\n"; } - return FALSE; + print "Device '$device' is currently in use by the following:\n\n"; + printf("\t%-*s %-*s %-*s %-4s\n", $l_driver, 'Driver', $l_target, 'Target', + $l_group, 'Group', 'Lun'); + print "\t"; + print join("", "-" x ($l_driver + $l_target + $l_group + 6)); + print "\n"; + + foreach my $driver (sort keys %{$exported}) { + foreach my $target (sort keys %{$$exported{$driver}}) { + foreach my $group (sort keys %{$$exported{$driver}->{$target}}) { + my $lun = $$exported{$driver}->{$target}->{$group}; + printf("\t%-*s %-*s %-*s %-4s\n", $l_driver, $driver, + $l_target, $target, $l_group, $group, $lun); + } + } + } } sub listAttributes { From 8f22880dee4ff3a6f112f1a916b27347e06f6d3c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 7 Jan 2018 02:25:10 +0000 Subject: [PATCH 2/2] scstadmin: Slightly change the output format of exported LUNs An example: # scstadmin -noprompt -handler vdisk_fileio -close_dev diskf0 Collecting current configuration: done. -> Making requested changes. Device 'diskf0' is currently in use by the following: Driver Target Group Lun ---------- ----------------------- ----- ---- iscsi iqn.2012-06.be.bva:tgt1 61 scst_local disks 1 FATAL: Received the following error: Device 'diskf0' still in use, aborting. Use -force to override. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7334 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/scstadmin.sysfs/scstadmin | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index a3b1bb2c6..609021ca8 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -3550,6 +3550,7 @@ sub listExported { my $l_driver = length('Driver'); my $l_target = length('Target'); my $l_group = length('Group'); + my $fmt = "\t%-*s %-*s %-*s %-4s\n"; foreach my $driver (keys %{$exported}) { $l_driver = length($driver) @@ -3567,18 +3568,18 @@ sub listExported { } print "Device '$device' is currently in use by the following:\n\n"; - printf("\t%-*s %-*s %-*s %-4s\n", $l_driver, 'Driver', $l_target, 'Target', + printf($fmt, $l_driver, 'Driver', $l_target, 'Target', $l_group, 'Group', 'Lun'); - print "\t"; - print join("", "-" x ($l_driver + $l_target + $l_group + 6)); - print "\n"; + printf($fmt, $l_driver, join("", "-" x $l_driver), + $l_target, join("", "-" x $l_target), + $l_group, join("", "-" x $l_group), join("", "-" x 4)); foreach my $driver (sort keys %{$exported}) { foreach my $target (sort keys %{$$exported{$driver}}) { foreach my $group (sort keys %{$$exported{$driver}->{$target}}) { my $lun = $$exported{$driver}->{$target}->{$group}; - printf("\t%-*s %-*s %-*s %-4s\n", $l_driver, $driver, - $l_target, $target, $l_group, $group, $lun); + printf($fmt, $l_driver, $driver, $l_target, + $target, $l_group, $group, $lun); } } }