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

- Apply target attributes before assigning LUNs.

Browse Source 
- Always enable/disable targets and drivers last.



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2710 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2010-11-15 15:55:39 +00:00
parent e66128f414
commit 988147c48b
1 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scstadmin/scstadmin.sysfs/scstadmin
View File

@@ -1912,14 +1912,18 @@ sub applyConfigAssignments {
}
my %_attributes;
my %special;
foreach my $item (keys %{$$assignments{$driver}}) {
if ($item eq 'TARGET') {
$changes += applyTargetAssignments($driver, $$assignments{$driver}->{$item},
$deletions);
} else {
} elsif ($item ne 'enabled') {
# Enable driver last
$_attributes{$item} = $$assignments{$driver}->{$item};
}
} else {
$special{$item} = $$assignments{$driver}->{$item};
}
}
my $attributes = configToAttr(\%_attributes);
@@ -1927,6 +1931,15 @@ sub applyConfigAssignments {
if (scalar keys %{$attributes}) {
$changes += setDriverAttributes($driver, $attributes, $deletions);
}
$attributes = configToAttr(\%special);
my $d_attributes = $SCST->driverAttributes($driver);
if (defined($$d_attributes{'enabled'}) &&
($$d_attributes{'enabled'}->{'value'} != $$attributes{'enabled'})) {
setDriverAttribute($driver, 'enabled', $$attributes{'enabled'});
$changes++;
}
}
return $changes;
@@ -2051,21 +2064,38 @@ sub applyTargetAssignments {
}
}
# Apply attribute changes first in case we want a different address method applied
my %_attributes;
foreach my $item (keys %{$$targets{$target}}) {
# Handle enabled attribute last
next if (($item eq 'GROUP') || ($item eq 'LUN') || ($item eq 'enabled'));
$_attributes{$item} = $$targets{$target}->{$item};
}
my $attributes = configToAttr(\%_attributes);
filterCreateAttributes($possible, $attributes, TRUE);
$changes += setTargetAttributes($driver, $target, $attributes, $deletions);
%_attributes = ();
foreach my $item (keys %{$$targets{$target}}) {
if ($item eq 'GROUP') {
$changes += applyGroupAssignments($driver, $target, $$targets{$target}->{$item});
$changes += applyInitiatorAssignments($driver, $target, $$targets{$target}->{$item}, $deletions);
} elsif ($item eq 'LUN') {
$changes += applyLunAssignments($driver, $target, undef, $$targets{$target}->{$item});
} else {
} elsif ($item eq 'enabled') {
$_attributes{$item} = $$targets{$target}->{$item};
}
}
my $attributes = configToAttr(\%_attributes);
filterCreateAttributes($possible, $attributes, TRUE);
$changes += setTargetAttributes($driver, $target, $attributes, $deletions);
$attributes = configToAttr(\%_attributes);
my $t_attributes = $SCST->targetAttributes($driver, $target);
if (defined($$t_attributes{'enabled'}) &&
($$t_attributes{'enabled'}->{'value'} != $$attributes{'enabled'})) {
setTargetAttribute($driver, $target, 'enabled', $$attributes{'enabled'});
$changes++;
}
}
return $changes;