Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9df937a authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-tape: mv idetape_empty_write_pipeline ide_tape_flush_merge_buffer 



Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ec0fdb01

drivers/ide/ide-tape.c

+4 −4
Original line number Diff line number Diff line
@@ -1779,7 +1779,7 @@ static int idetape_add_chrdev_write_request(ide_drive_t *drive, int blocks) 
				     blocks, tape->merge_stage->bh);

}



static void idetape_empty_write_pipeline(ide_drive_t *drive)

static void ide_tape_flush_merge_buffer(ide_drive_t *drive)

{

	idetape_tape_t *tape = drive->driver_data;

	int blocks, min;
@@ -1841,7 +1841,7 @@ static int idetape_init_read(ide_drive_t *drive) 
	/* Initialize read operation */

	if (tape->chrdev_dir != IDETAPE_DIR_READ) {

		if (tape->chrdev_dir == IDETAPE_DIR_WRITE) {

			idetape_empty_write_pipeline(drive);

			ide_tape_flush_merge_buffer(drive);

			idetape_flush_tape_buffers(drive);

		}

		if (tape->merge_stage || tape->merge_stage_size) {
@@ -2357,7 +2357,7 @@ static int idetape_chrdev_ioctl(struct inode *inode, struct file *file, 
	debug_log(DBG_CHRDEV, "Enter %s, cmd=%u\n", __func__, cmd);



	if (tape->chrdev_dir == IDETAPE_DIR_WRITE) {

		idetape_empty_write_pipeline(drive);

		ide_tape_flush_merge_buffer(drive);

		idetape_flush_tape_buffers(drive);

	}

	if (cmd == MTIOCGET || cmd == MTIOCPOS) {
@@ -2506,7 +2506,7 @@ static void idetape_write_release(ide_drive_t *drive, unsigned int minor) 
{

	idetape_tape_t *tape = drive->driver_data;



	idetape_empty_write_pipeline(drive);

	ide_tape_flush_merge_buffer(drive);

	tape->merge_stage = ide_tape_kmalloc_buffer(tape, 1, 0);

	if (tape->merge_stage != NULL) {

		idetape_pad_zeros(drive, tape->blk_size *