summaryrefslogtreecommitdiffstats
path: root/drivers/char/ftape/lowlevel/ftape-rw.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-03-17 22:05:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-03-17 22:05:47 +0000
commit27cfca1ec98e91261b1a5355d10a8996464b63af (patch)
tree8e895a53e372fa682b4c0a585b9377d67ed70d0e /drivers/char/ftape/lowlevel/ftape-rw.c
parent6a76fb7214c477ccf6582bd79c5b4ccc4f9c41b1 (diff)
Look Ma' what I found on my harddisk ...
o New faster syscalls for 2.1.x, too o Upgrade to 2.1.89. Don't try to run this. It's flaky as hell. But feel free to debug ...
Diffstat (limited to 'drivers/char/ftape/lowlevel/ftape-rw.c')
-rw-r--r--drivers/char/ftape/lowlevel/ftape-rw.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/ftape/lowlevel/ftape-rw.c b/drivers/char/ftape/lowlevel/ftape-rw.c
index e3e0243f0..2ae96344e 100644
--- a/drivers/char/ftape/lowlevel/ftape-rw.c
+++ b/drivers/char/ftape/lowlevel/ftape-rw.c
@@ -432,7 +432,8 @@ int ftape_dumb_stop(void)
*/
result = ftape_ready_wait(ftape_timeout.pause,&status);
}
- } while (ftape_tape_running && (current->signal & _NEVER_BLOCK) == 0);
+ } while (ftape_tape_running
+ && !(sigtestsetmask(&current->signal, _NEVER_BLOCK)));
#ifndef TESTING
ft_location.known = 0;
#endif
@@ -660,7 +661,7 @@ static int seek_forward(int segment_id, int fast)
* to find a way to skip an EMPTY_SEGMENT. !!! FIXME !!!
*/
if (ftape_read_id() < 0 || !ft_location.known ||
- (current->signal & _DONT_BLOCK)) {
+ sigtestsetmask(&current->signal, _DONT_BLOCK)) {
ft_location.known = 0;
if (!ftape_tape_running ||
++failures > FT_SECTORS_PER_SEGMENT) {
@@ -775,7 +776,7 @@ static int skip_reverse(int segment_id, int *pstatus)
fast_seek(count, 1);
logical_forward();
if (ftape_read_id() < 0 || !ft_location.known ||
- (current->signal & _DONT_BLOCK)) {
+ (sigtestsetmask(&current->signal, _DONT_BLOCK))) {
if ((!ftape_tape_running && !ft_location.known) ||
++failures > FT_SECTORS_PER_SEGMENT) {
TRACE_ABORT(-EIO, ft_t_err,
@@ -1001,7 +1002,7 @@ int ftape_start_tape(int segment_id, int sector_offset)
while (result < 0 &&
retry++ <= 5 &&
!ft_failure &&
- (current->signal & _DONT_BLOCK) == 0) {
+ !(sigtestsetmask(&current->signal, _DONT_BLOCK))) {
if (retry && start_offset < 5) {
start_offset ++;