patch-2.1.81 linux/drivers/char/ftape/lowlevel/ftape-rw.c

• Lines: 37
• Date: Fri Jan 23 17:38:04 1998
• Orig file: v2.1.80/linux/drivers/char/ftape/lowlevel/ftape-rw.c
• Orig date: Tue Nov 25 14:45:27 1997

diff -u --recursive --new-file v2.1.80/linux/drivers/char/ftape/lowlevel/ftape-rw.c linux/drivers/char/ftape/lowlevel/ftape-rw.c
@@ -432,7 +432,8 @@
 			 */
 			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 @@
 		 *  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 @@
 		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 @@
 	while (result < 0     &&
 	       retry++ <= 5   &&
 	       !ft_failure &&
-	       (current->signal & _DONT_BLOCK) == 0) {
+	       !(sigtestsetmask(&current->signal, _DONT_BLOCK))) {
 		
 		if (retry && start_offset < 5) {
 			start_offset ++;