patch-2.4.0-test5 linux/drivers/ide/ide-tape.c

Next file: linux/drivers/ide/ide.c
Previous file: linux/drivers/ide/ide-pci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/ide/ide-tape.c linux/drivers/ide/ide-tape.c
@@ -1539,7 +1539,7 @@
  
 /**************************************************************
  *                                                            *
- *  This should get fixed to use kmalloc(GFP_ATOMIC, ..)      *
+ *  This should get fixed to use kmalloc(.., GFP_ATOMIC)      *
  *  followed later on by kfree().   -ml                       *
  *                                                            *
  **************************************************************/
@@ -3913,10 +3913,14 @@
 #endif
 				clear_bit(IDETAPE_PIPELINE_ERROR, &tape->flags);
 				position = idetape_read_position(drive);
+				if (position >= 3000 && position < 3080)
+					position += 32;
 				if (position >= 2980 && position < 3000)
 					position = 3000;
 				else
 					position += 60;
+				if (position >= 2980 && position < 3000)
+					position = 3000;
 				printk(KERN_INFO "ide-tape: %s: blank block detected, positioning tape to block %d\n", tape->name, position);
 				idetape_position_tape(drive, position, 0, 1);
 				cnt += 40;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)