ide-tape: remove unused parameter from idetape_copy_stage_from_user
Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
99d74e61ef
commit
8646c88f15
|
@ -1587,7 +1587,7 @@ abort:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int idetape_copy_stage_from_user(idetape_tape_t *tape,
|
static int idetape_copy_stage_from_user(idetape_tape_t *tape,
|
||||||
idetape_stage_t *stage, const char __user *buf, int n)
|
const char __user *buf, int n)
|
||||||
{
|
{
|
||||||
struct idetape_bh *bh = tape->bh;
|
struct idetape_bh *bh = tape->bh;
|
||||||
int count;
|
int count;
|
||||||
|
@ -2588,8 +2588,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
|
||||||
actually_written = min((unsigned int)
|
actually_written = min((unsigned int)
|
||||||
(tape->stage_size - tape->merge_stage_size),
|
(tape->stage_size - tape->merge_stage_size),
|
||||||
(unsigned int)count);
|
(unsigned int)count);
|
||||||
if (idetape_copy_stage_from_user(tape, tape->merge_stage, buf,
|
if (idetape_copy_stage_from_user(tape, buf, actually_written))
|
||||||
actually_written))
|
|
||||||
ret = -EFAULT;
|
ret = -EFAULT;
|
||||||
buf += actually_written;
|
buf += actually_written;
|
||||||
tape->merge_stage_size += actually_written;
|
tape->merge_stage_size += actually_written;
|
||||||
|
@ -2605,8 +2604,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
|
||||||
}
|
}
|
||||||
while (count >= tape->stage_size) {
|
while (count >= tape->stage_size) {
|
||||||
ssize_t retval;
|
ssize_t retval;
|
||||||
if (idetape_copy_stage_from_user(tape, tape->merge_stage, buf,
|
if (idetape_copy_stage_from_user(tape, buf, tape->stage_size))
|
||||||
tape->stage_size))
|
|
||||||
ret = -EFAULT;
|
ret = -EFAULT;
|
||||||
buf += tape->stage_size;
|
buf += tape->stage_size;
|
||||||
count -= tape->stage_size;
|
count -= tape->stage_size;
|
||||||
|
@ -2617,8 +2615,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
|
||||||
}
|
}
|
||||||
if (count) {
|
if (count) {
|
||||||
actually_written += count;
|
actually_written += count;
|
||||||
if (idetape_copy_stage_from_user(tape, tape->merge_stage, buf,
|
if (idetape_copy_stage_from_user(tape, buf, count))
|
||||||
count))
|
|
||||||
ret = -EFAULT;
|
ret = -EFAULT;
|
||||||
tape->merge_stage_size += count;
|
tape->merge_stage_size += count;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue