ide-tape: mv tape->merge_stage_size tape->merge_bh_size (01a63aeb) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/ide/ide-tape.c

+31 −30

Original line number	Original line	Diff line number	Diff line
	@@ -310,7 +310,8 @@ typedef struct ide_tape_obj {
	/* Data buffer size chosen based on the tape's recommendation */		/* Data buffer size chosen based on the tape's recommendation */
	int buffer_size;		int buffer_size;
	idetape_stage_t *merge_stage;		idetape_stage_t *merge_stage;
	int merge_stage_size;		/* size of the merge buffer */
			int merge_bh_size;
	struct idetape_bh *bh;		struct idetape_bh *bh;
	char *b_data;		char *b_data;
	int b_count;		int b_count;
	@@ -1649,7 +1650,7 @@ static void __ide_tape_discard_merge_buffer(ide_drive_t *drive)
	return;		return;

	clear_bit(IDETAPE_FLAG_FILEMARK, &tape->flags);		clear_bit(IDETAPE_FLAG_FILEMARK, &tape->flags);
	tape->merge_stage_size = 0;		tape->merge_bh_size = 0;
	if (tape->merge_stage != NULL) {		if (tape->merge_stage != NULL) {
	ide_tape_kfree_buffer(tape->merge_stage);		ide_tape_kfree_buffer(tape->merge_stage);
	tape->merge_stage = NULL;		tape->merge_stage = NULL;
	@@ -1790,17 +1791,17 @@ static void ide_tape_flush_merge_buffer(ide_drive_t *drive)
	" but we are not writing.\n");		" but we are not writing.\n");
	return;		return;
	}		}
	if (tape->merge_stage_size > tape->buffer_size) {		if (tape->merge_bh_size > tape->buffer_size) {
	printk(KERN_ERR "ide-tape: bug: merge_buffer too big\n");		printk(KERN_ERR "ide-tape: bug: merge_buffer too big\n");
	tape->merge_stage_size = tape->buffer_size;		tape->merge_bh_size = tape->buffer_size;
	}		}
	if (tape->merge_stage_size) {		if (tape->merge_bh_size) {
	blocks = tape->merge_stage_size / tape->blk_size;		blocks = tape->merge_bh_size / tape->blk_size;
	if (tape->merge_stage_size % tape->blk_size) {		if (tape->merge_bh_size % tape->blk_size) {
	unsigned int i;		unsigned int i;

	blocks++;		blocks++;
	i = tape->blk_size - tape->merge_stage_size %		i = tape->blk_size - tape->merge_bh_size %
	tape->blk_size;		tape->blk_size;
	bh = tape->bh->b_reqnext;		bh = tape->bh->b_reqnext;
	while (bh) {		while (bh) {
	@@ -1824,7 +1825,7 @@ static void ide_tape_flush_merge_buffer(ide_drive_t *drive)
	}		}
	}		}
	(void) idetape_add_chrdev_write_request(drive, blocks);		(void) idetape_add_chrdev_write_request(drive, blocks);
	tape->merge_stage_size = 0;		tape->merge_bh_size = 0;
	}		}
	if (tape->merge_stage != NULL) {		if (tape->merge_stage != NULL) {
	ide_tape_kfree_buffer(tape->merge_stage);		ide_tape_kfree_buffer(tape->merge_stage);
	@@ -1844,10 +1845,10 @@ static int idetape_init_read(ide_drive_t *drive)
	ide_tape_flush_merge_buffer(drive);		ide_tape_flush_merge_buffer(drive);
	idetape_flush_tape_buffers(drive);		idetape_flush_tape_buffers(drive);
	}		}
	if (tape->merge_stage \|\| tape->merge_stage_size) {		if (tape->merge_stage \|\| tape->merge_bh_size) {
	printk(KERN_ERR "ide-tape: merge_stage_size should be"		printk(KERN_ERR "ide-tape: merge_bh_size should be"
	" 0 now\n");		" 0 now\n");
	tape->merge_stage_size = 0;		tape->merge_bh_size = 0;
	}		}
	tape->merge_stage = ide_tape_kmalloc_buffer(tape, 0, 0);		tape->merge_stage = ide_tape_kmalloc_buffer(tape, 0, 0);
	if (!tape->merge_stage)		if (!tape->merge_stage)
	@@ -1993,7 +1994,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,
	}		}

	if (tape->chrdev_dir == IDETAPE_DIR_READ) {		if (tape->chrdev_dir == IDETAPE_DIR_READ) {
	tape->merge_stage_size = 0;		tape->merge_bh_size = 0;
	if (test_and_clear_bit(IDETAPE_FLAG_FILEMARK, &tape->flags))		if (test_and_clear_bit(IDETAPE_FLAG_FILEMARK, &tape->flags))
	++count;		++count;
	ide_tape_discard_merge_buffer(drive, 0);		ide_tape_discard_merge_buffer(drive, 0);
	@@ -2063,13 +2064,13 @@ static ssize_t idetape_chrdev_read(struct file file, char __user buf,
	return rc;		return rc;
	if (count == 0)		if (count == 0)
	return (0);		return (0);
	if (tape->merge_stage_size) {		if (tape->merge_bh_size) {
	actually_read = min((unsigned int)(tape->merge_stage_size),		actually_read = min((unsigned int)(tape->merge_bh_size),
	(unsigned int)count);		(unsigned int)count);
	if (idetape_copy_stage_to_user(tape, buf, actually_read))		if (idetape_copy_stage_to_user(tape, buf, actually_read))
	ret = -EFAULT;		ret = -EFAULT;
	buf += actually_read;		buf += actually_read;
	tape->merge_stage_size -= actually_read;		tape->merge_bh_size -= actually_read;
	count -= actually_read;		count -= actually_read;
	}		}
	while (count >= tape->buffer_size) {		while (count >= tape->buffer_size) {
	@@ -2090,7 +2091,7 @@ static ssize_t idetape_chrdev_read(struct file file, char __user buf,
	if (idetape_copy_stage_to_user(tape, buf, temp))		if (idetape_copy_stage_to_user(tape, buf, temp))
	ret = -EFAULT;		ret = -EFAULT;
	actually_read += temp;		actually_read += temp;
	tape->merge_stage_size = bytes_read-temp;		tape->merge_bh_size = bytes_read-temp;
	}		}
	finish:		finish:
	if (!actually_read && test_bit(IDETAPE_FLAG_FILEMARK, &tape->flags)) {		if (!actually_read && test_bit(IDETAPE_FLAG_FILEMARK, &tape->flags)) {
	@@ -2122,10 +2123,10 @@ static ssize_t idetape_chrdev_write(struct file file, const char __user buf,
	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)
	ide_tape_discard_merge_buffer(drive, 1);		ide_tape_discard_merge_buffer(drive, 1);
	if (tape->merge_stage \|\| tape->merge_stage_size) {		if (tape->merge_stage \|\| tape->merge_bh_size) {
	printk(KERN_ERR "ide-tape: merge_stage_size "		printk(KERN_ERR "ide-tape: merge_bh_size "
	"should be 0 now\n");		"should be 0 now\n");
	tape->merge_stage_size = 0;		tape->merge_bh_size = 0;
	}		}
	tape->merge_stage = ide_tape_kmalloc_buffer(tape, 0, 0);		tape->merge_stage = ide_tape_kmalloc_buffer(tape, 0, 0);
	if (!tape->merge_stage)		if (!tape->merge_stage)
	@@ -2153,23 +2154,23 @@ static ssize_t idetape_chrdev_write(struct file file, const char __user buf,
	}		}
	if (count == 0)		if (count == 0)
	return (0);		return (0);
	if (tape->merge_stage_size) {		if (tape->merge_bh_size) {
	if (tape->merge_stage_size >= tape->buffer_size) {		if (tape->merge_bh_size >= tape->buffer_size) {
	printk(KERN_ERR "ide-tape: bug: merge buf too big\n");		printk(KERN_ERR "ide-tape: bug: merge buf too big\n");
	tape->merge_stage_size = 0;		tape->merge_bh_size = 0;
	}		}
	actually_written = min((unsigned int)		actually_written = min((unsigned int)
	(tape->buffer_size - tape->merge_stage_size),		(tape->buffer_size - tape->merge_bh_size),
	(unsigned int)count);		(unsigned int)count);
	if (idetape_copy_stage_from_user(tape, buf, actually_written))		if (idetape_copy_stage_from_user(tape, buf, actually_written))
	ret = -EFAULT;		ret = -EFAULT;
	buf += actually_written;		buf += actually_written;
	tape->merge_stage_size += actually_written;		tape->merge_bh_size += actually_written;
	count -= actually_written;		count -= actually_written;

	if (tape->merge_stage_size == tape->buffer_size) {		if (tape->merge_bh_size == tape->buffer_size) {
	ssize_t retval;		ssize_t retval;
	tape->merge_stage_size = 0;		tape->merge_bh_size = 0;
	retval = idetape_add_chrdev_write_request(drive, ctl);		retval = idetape_add_chrdev_write_request(drive, ctl);
	if (retval <= 0)		if (retval <= 0)
	return (retval);		return (retval);
	@@ -2190,7 +2191,7 @@ static ssize_t idetape_chrdev_write(struct file file, const char __user buf,
	actually_written += count;		actually_written += count;
	if (idetape_copy_stage_from_user(tape, buf, count))		if (idetape_copy_stage_from_user(tape, buf, count))
	ret = -EFAULT;		ret = -EFAULT;
	tape->merge_stage_size += count;		tape->merge_bh_size += count;
	}		}
	return ret ? ret : actually_written;		return ret ? ret : actually_written;
	}		}
	@@ -2361,7 +2362,7 @@ static int idetape_chrdev_ioctl(struct inode inode, struct file file,
	idetape_flush_tape_buffers(drive);		idetape_flush_tape_buffers(drive);
	}		}
	if (cmd == MTIOCGET \|\| cmd == MTIOCPOS) {		if (cmd == MTIOCGET \|\| cmd == MTIOCPOS) {
	block_offset = tape->merge_stage_size /		block_offset = tape->merge_bh_size /
	(tape->blk_size * tape->user_bs_factor);		(tape->blk_size * tape->user_bs_factor);
	position = idetape_read_position(drive);		position = idetape_read_position(drive);
	if (position < 0)		if (position < 0)
	@@ -2790,7 +2791,7 @@ static void ide_tape_release(struct kref *kref)
	ide_drive_t *drive = tape->drive;		ide_drive_t *drive = tape->drive;
	struct gendisk *g = tape->disk;		struct gendisk *g = tape->disk;

	BUG_ON(tape->merge_stage_size);		BUG_ON(tape->merge_bh_size);

	drive->dsc_overlap = 0;		drive->dsc_overlap = 0;
	drive->driver_data = NULL;		drive->driver_data = NULL;