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

scstadmin: Make _syswrite() translate EBUSY into "writing failed" (merge r4400 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4591 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-11-03 14:45:49 +00:00
parent e991bd4845
commit ff41d8c887
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
scstadmin/scstadmin.sysfs/scst-0.9.10/lib/SCST/SCST.pm
View File

@@ -4870,35 +4870,32 @@ sub _syswrite {
my $bytes = syswrite($io, $cmd, $length);
if (!defined($bytes) && defined($res_file)) {
if ($! == EAGAIN) {
my $res = new IO::File $res_file, O_RDONLY;
if (!defined($bytes) && defined($res_file) && $! == EAGAIN) {
my $res_io = new IO::File $res_file, O_RDONLY;
if (!$res) {
cluck("FATAL: Failed opening $res_file: $!");
return undef;
}
if (!$res_io) {
cluck("FATAL: Failed opening $res_file: $!");
return undef;
}
my $wait = TRUE;
my $result;
my $res_val;
while ($wait && (($now + $TIMEOUT) > time())) {
sysread($res, $result, 8);
$wait = FALSE if ($! != EAGAIN);
while (($now + $TIMEOUT) > time()) {
if (!defined(sysread($res_io, $res_val, 8)) &&
$! == EAGAIN) {
sleep 1;
}
if ($wait) {
my $_cmd = $cmd; chomp $_cmd;
cluck("Timeout while waiting for command '$_cmd' to complete");
$bytes = undef;
} else {
$bytes = length($cmd) if ($result == 0);
last;
}
}
close $res;
} elsif ($! == EBUSY) {
return -1;
close $res_io;
if (!defined($res_val)) {
my $_cmd = $cmd; chomp $_cmd;
cluck("Timeout while waiting for command '$_cmd' to complete");
} elsif ($res_val == 0) {
$bytes = $length;
}
}