diff options
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 1358d8351f33..00b7e0cb8b1a 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -1779,7 +1779,7 @@ static int idetape_add_chrdev_write_request(ide_drive_t *drive, int blocks) | |||
1779 | blocks, tape->merge_stage->bh); | 1779 | blocks, tape->merge_stage->bh); |
1780 | } | 1780 | } |
1781 | 1781 | ||
1782 | static void idetape_empty_write_pipeline(ide_drive_t *drive) | 1782 | static void ide_tape_flush_merge_buffer(ide_drive_t *drive) |
1783 | { | 1783 | { |
1784 | idetape_tape_t *tape = drive->driver_data; | 1784 | idetape_tape_t *tape = drive->driver_data; |
1785 | int blocks, min; | 1785 | int blocks, min; |
@@ -1841,7 +1841,7 @@ static int idetape_init_read(ide_drive_t *drive) | |||
1841 | /* Initialize read operation */ | 1841 | /* Initialize read operation */ |
1842 | if (tape->chrdev_dir != IDETAPE_DIR_READ) { | 1842 | if (tape->chrdev_dir != IDETAPE_DIR_READ) { |
1843 | if (tape->chrdev_dir == IDETAPE_DIR_WRITE) { | 1843 | if (tape->chrdev_dir == IDETAPE_DIR_WRITE) { |
1844 | idetape_empty_write_pipeline(drive); | 1844 | ide_tape_flush_merge_buffer(drive); |
1845 | idetape_flush_tape_buffers(drive); | 1845 | idetape_flush_tape_buffers(drive); |
1846 | } | 1846 | } |
1847 | if (tape->merge_stage || tape->merge_stage_size) { | 1847 | if (tape->merge_stage || tape->merge_stage_size) { |
@@ -2357,7 +2357,7 @@ static int idetape_chrdev_ioctl(struct inode *inode, struct file *file, | |||
2357 | debug_log(DBG_CHRDEV, "Enter %s, cmd=%u\n", __func__, cmd); | 2357 | debug_log(DBG_CHRDEV, "Enter %s, cmd=%u\n", __func__, cmd); |
2358 | 2358 | ||
2359 | if (tape->chrdev_dir == IDETAPE_DIR_WRITE) { | 2359 | if (tape->chrdev_dir == IDETAPE_DIR_WRITE) { |
2360 | idetape_empty_write_pipeline(drive); | 2360 | ide_tape_flush_merge_buffer(drive); |
2361 | idetape_flush_tape_buffers(drive); | 2361 | idetape_flush_tape_buffers(drive); |
2362 | } | 2362 | } |
2363 | if (cmd == MTIOCGET || cmd == MTIOCPOS) { | 2363 | if (cmd == MTIOCGET || cmd == MTIOCPOS) { |
@@ -2506,7 +2506,7 @@ static void idetape_write_release(ide_drive_t *drive, unsigned int minor) | |||
2506 | { | 2506 | { |
2507 | idetape_tape_t *tape = drive->driver_data; | 2507 | idetape_tape_t *tape = drive->driver_data; |
2508 | 2508 | ||
2509 | idetape_empty_write_pipeline(drive); | 2509 | ide_tape_flush_merge_buffer(drive); |
2510 | tape->merge_stage = ide_tape_kmalloc_buffer(tape, 1, 0); | 2510 | tape->merge_stage = ide_tape_kmalloc_buffer(tape, 1, 0); |
2511 | if (tape->merge_stage != NULL) { | 2511 | if (tape->merge_stage != NULL) { |
2512 | idetape_pad_zeros(drive, tape->blk_size * | 2512 | idetape_pad_zeros(drive, tape->blk_size * |