mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 03:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scstadmin: Unify the code for enumerating all SCST devices and the code for enumerating all SCST devices associated with a specific device handler

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3697 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2011-07-20 14:47:45 +00:00
parent a66cbc4115
commit 573ab14fe1
1 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scstadmin/scstadmin.sysfs/scst-0.9.00/lib/SCST/SCST.pm
View File

@@ -1920,10 +1920,12 @@ sub clearLuns {
sub devices {
my $self = shift;
my $handler = shift;
my @devices;
my $dHandle = new IO::Handle;
my $_path = SCST_DEVICES_DIR();
my $_path = new_sysfs_interface() || !defined($handler) ?
SCST_DEVICES_DIR() : mkpath(SCST_HANDLERS_DIR(), $handler);
if (!(opendir $dHandle, $_path)) {
$self->{'err_string'} = "devices(): Unable to read directory '$_path': $!";
return undef;
@@ -1931,11 +1933,11 @@ sub devices {
if (new_sysfs_interface()) {
foreach my $device (readdir($dHandle)) {
my $link = readlink(mkpath(SCST_DEVICES_DIR(),
$device));
$link =~ s/.*\///;
if ($link) {
push @devices, $link;
my $driver = readlink(mkpath($_path, $device,
"driver"));
$driver =~ s/.*\///;
if (!defined($handler) || $driver eq $handler) {
push @devices, $device;
}
}
} else {
@@ -2913,6 +2915,8 @@ sub handlerAttributes {
return undef;
}
$attributes{'devices'}->{'value'} = devices($self, $handler);
my $hHandle = new IO::Handle;
my $_path = mkpath(SCST_HANDLERS_DIR(), $handler);
if (!(opendir $hHandle, $_path)) {
@@ -2920,34 +2924,6 @@ sub handlerAttributes {
return undef;
}
if (new_sysfs_interface()) {
$_path = SCST_DEVICES_DIR();
if (!opendir($hHandle, $_path)) {
$self->{'err_string'} = "handlerAttributes(): Unable".
" to read directory '$_path': $!";
return undef;
}
foreach my $dev (readdir($hHandle)) {
next if ($dev eq '.' || $dev eq '..');
my $driver = readlink("$_path/$dev/driver");
$driver =~ s/.*\///;
if ($driver eq $handler) {
push @{$attributes{'devices'}->{'value'}}, $dev;
}
}
} else {
foreach my $attribute (readdir($hHandle)) {
next if ($attribute eq '.' || $attribute eq '..');
my $pPath = mkpath($_path, $attribute);
if (-d $pPath) {
push @{$attributes{'devices'}->{'value'}},
$attribute;
}
}
}
foreach my $attribute (readdir($hHandle)) {
next if ($attribute eq '.' || $attribute eq '..' ||
$attribute eq SCST_MGMT_IO || $attribute eq 'uevent' ||