Commit ec0fdb01 authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz

ide-tape: mv idetape_discard_read_pipeline ide_tape_discard_merge_buffer

Also, rename its __-low level helper too.
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 9798630a
...@@ -1641,7 +1641,7 @@ static int idetape_create_prevent_cmd(ide_drive_t *drive, ...@@ -1641,7 +1641,7 @@ static int idetape_create_prevent_cmd(ide_drive_t *drive,
return 1; return 1;
} }
static void __idetape_discard_read_pipeline(ide_drive_t *drive) static void __ide_tape_discard_merge_buffer(ide_drive_t *drive)
{ {
idetape_tape_t *tape = drive->driver_data; idetape_tape_t *tape = drive->driver_data;
...@@ -1672,7 +1672,7 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block, ...@@ -1672,7 +1672,7 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block,
struct ide_atapi_pc pc; struct ide_atapi_pc pc;
if (tape->chrdev_dir == IDETAPE_DIR_READ) if (tape->chrdev_dir == IDETAPE_DIR_READ)
__idetape_discard_read_pipeline(drive); __ide_tape_discard_merge_buffer(drive);
idetape_wait_ready(drive, 60 * 5 * HZ); idetape_wait_ready(drive, 60 * 5 * HZ);
idetape_create_locate_cmd(drive, &pc, block, partition, skip); idetape_create_locate_cmd(drive, &pc, block, partition, skip);
retval = idetape_queue_pc_tail(drive, &pc); retval = idetape_queue_pc_tail(drive, &pc);
...@@ -1683,19 +1683,19 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block, ...@@ -1683,19 +1683,19 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block,
return (idetape_queue_pc_tail(drive, &pc)); return (idetape_queue_pc_tail(drive, &pc));
} }
static void idetape_discard_read_pipeline(ide_drive_t *drive, static void ide_tape_discard_merge_buffer(ide_drive_t *drive,
int restore_position) int restore_position)
{ {
idetape_tape_t *tape = drive->driver_data; idetape_tape_t *tape = drive->driver_data;
int seek, position; int seek, position;
__idetape_discard_read_pipeline(drive); __ide_tape_discard_merge_buffer(drive);
if (restore_position) { if (restore_position) {
position = idetape_read_position(drive); position = idetape_read_position(drive);
seek = position > 0 ? position : 0; seek = position > 0 ? position : 0;
if (idetape_position_tape(drive, seek, 0, 0)) { if (idetape_position_tape(drive, seek, 0, 0)) {
printk(KERN_INFO "ide-tape: %s: position_tape failed in" printk(KERN_INFO "ide-tape: %s: position_tape failed in"
" discard_pipeline()\n", tape->name); " %s\n", tape->name, __func__);
return; return;
} }
} }
...@@ -1996,7 +1996,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op, ...@@ -1996,7 +1996,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,
tape->merge_stage_size = 0; tape->merge_stage_size = 0;
if (test_and_clear_bit(IDETAPE_FLAG_FILEMARK, &tape->flags)) if (test_and_clear_bit(IDETAPE_FLAG_FILEMARK, &tape->flags))
++count; ++count;
idetape_discard_read_pipeline(drive, 0); ide_tape_discard_merge_buffer(drive, 0);
} }
/* /*
...@@ -2121,7 +2121,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf, ...@@ -2121,7 +2121,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
/* Initialize write operation */ /* Initialize write operation */
if (tape->chrdev_dir != IDETAPE_DIR_WRITE) { if (tape->chrdev_dir != IDETAPE_DIR_WRITE) {
if (tape->chrdev_dir == IDETAPE_DIR_READ) if (tape->chrdev_dir == IDETAPE_DIR_READ)
idetape_discard_read_pipeline(drive, 1); ide_tape_discard_merge_buffer(drive, 1);
if (tape->merge_stage || tape->merge_stage_size) { if (tape->merge_stage || tape->merge_stage_size) {
printk(KERN_ERR "ide-tape: merge_stage_size " printk(KERN_ERR "ide-tape: merge_stage_size "
"should be 0 now\n"); "should be 0 now\n");
...@@ -2246,7 +2246,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count) ...@@ -2246,7 +2246,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
case MTWEOF: case MTWEOF:
if (tape->write_prot) if (tape->write_prot)
return -EACCES; return -EACCES;
idetape_discard_read_pipeline(drive, 1); ide_tape_discard_merge_buffer(drive, 1);
for (i = 0; i < mt_count; i++) { for (i = 0; i < mt_count; i++) {
retval = idetape_write_filemark(drive); retval = idetape_write_filemark(drive);
if (retval) if (retval)
...@@ -2254,12 +2254,12 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count) ...@@ -2254,12 +2254,12 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
} }
return 0; return 0;
case MTREW: case MTREW:
idetape_discard_read_pipeline(drive, 0); ide_tape_discard_merge_buffer(drive, 0);
if (idetape_rewind_tape(drive)) if (idetape_rewind_tape(drive))
return -EIO; return -EIO;
return 0; return 0;
case MTLOAD: case MTLOAD:
idetape_discard_read_pipeline(drive, 0); ide_tape_discard_merge_buffer(drive, 0);
idetape_create_load_unload_cmd(drive, &pc, idetape_create_load_unload_cmd(drive, &pc,
IDETAPE_LU_LOAD_MASK); IDETAPE_LU_LOAD_MASK);
return idetape_queue_pc_tail(drive, &pc); return idetape_queue_pc_tail(drive, &pc);
...@@ -2274,7 +2274,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count) ...@@ -2274,7 +2274,7 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
if (!idetape_queue_pc_tail(drive, &pc)) if (!idetape_queue_pc_tail(drive, &pc))
tape->door_locked = DOOR_UNLOCKED; tape->door_locked = DOOR_UNLOCKED;
} }
idetape_discard_read_pipeline(drive, 0); ide_tape_discard_merge_buffer(drive, 0);
idetape_create_load_unload_cmd(drive, &pc, idetape_create_load_unload_cmd(drive, &pc,
!IDETAPE_LU_LOAD_MASK); !IDETAPE_LU_LOAD_MASK);
retval = idetape_queue_pc_tail(drive, &pc); retval = idetape_queue_pc_tail(drive, &pc);
...@@ -2282,10 +2282,10 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count) ...@@ -2282,10 +2282,10 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
clear_bit(IDETAPE_FLAG_MEDIUM_PRESENT, &tape->flags); clear_bit(IDETAPE_FLAG_MEDIUM_PRESENT, &tape->flags);
return retval; return retval;
case MTNOP: case MTNOP:
idetape_discard_read_pipeline(drive, 0); ide_tape_discard_merge_buffer(drive, 0);
return idetape_flush_tape_buffers(drive); return idetape_flush_tape_buffers(drive);
case MTRETEN: case MTRETEN:
idetape_discard_read_pipeline(drive, 0); ide_tape_discard_merge_buffer(drive, 0);
idetape_create_load_unload_cmd(drive, &pc, idetape_create_load_unload_cmd(drive, &pc,
IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK); IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK);
return idetape_queue_pc_tail(drive, &pc); return idetape_queue_pc_tail(drive, &pc);
...@@ -2307,11 +2307,11 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count) ...@@ -2307,11 +2307,11 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
set_bit(IDETAPE_FLAG_DETECT_BS, &tape->flags); set_bit(IDETAPE_FLAG_DETECT_BS, &tape->flags);
return 0; return 0;
case MTSEEK: case MTSEEK:
idetape_discard_read_pipeline(drive, 0); ide_tape_discard_merge_buffer(drive, 0);
return idetape_position_tape(drive, return idetape_position_tape(drive,
mt_count * tape->user_bs_factor, tape->partition, 0); mt_count * tape->user_bs_factor, tape->partition, 0);
case MTSETPART: case MTSETPART:
idetape_discard_read_pipeline(drive, 0); ide_tape_discard_merge_buffer(drive, 0);
return idetape_position_tape(drive, 0, mt_count, 0); return idetape_position_tape(drive, 0, mt_count, 0);
case MTFSR: case MTFSR:
case MTBSR: case MTBSR:
...@@ -2393,7 +2393,7 @@ static int idetape_chrdev_ioctl(struct inode *inode, struct file *file, ...@@ -2393,7 +2393,7 @@ static int idetape_chrdev_ioctl(struct inode *inode, struct file *file,
return 0; return 0;
default: default:
if (tape->chrdev_dir == IDETAPE_DIR_READ) if (tape->chrdev_dir == IDETAPE_DIR_READ)
idetape_discard_read_pipeline(drive, 1); ide_tape_discard_merge_buffer(drive, 1);
return idetape_blkdev_ioctl(drive, cmd, arg); return idetape_blkdev_ioctl(drive, cmd, arg);
} }
} }
...@@ -2535,7 +2535,7 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp) ...@@ -2535,7 +2535,7 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
idetape_write_release(drive, minor); idetape_write_release(drive, minor);
if (tape->chrdev_dir == IDETAPE_DIR_READ) { if (tape->chrdev_dir == IDETAPE_DIR_READ) {
if (minor < 128) if (minor < 128)
idetape_discard_read_pipeline(drive, 1); ide_tape_discard_merge_buffer(drive, 1);
} }
if (minor < 128 && test_bit(IDETAPE_FLAG_MEDIUM_PRESENT, &tape->flags)) if (minor < 128 && test_bit(IDETAPE_FLAG_MEDIUM_PRESENT, &tape->flags))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment