evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ide-tape: remove idetape_remove_stage_head()

Browse source 
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Borislav Petkov 2008-04-27 15:38:26 +02:00 • committed by Bartlomiej Zolnierkiewicz
parent b361acb108
commit 473567f1a4
1 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/ide/ide-tape.c
View file

@ -691,41 +691,6 @@ static void idetape_kfree_stage(idetape_tape_t *tape, idetape_stage_t *stage)
__idetape_kfree_stage(stage); __idetape_kfree_stage(stage);
} }
/*
* Remove tape->first_stage from the pipeline. The caller should avoid race
* conditions.
*/
static void idetape_remove_stage_head(ide_drive_t *drive)
{
idetape_tape_t *tape = drive->driver_data;
idetape_stage_t *stage;
debug_log(DBG_PROCS, "Enter %s\n", __func__);
if (tape->first_stage == NULL) {
printk(KERN_ERR "ide-tape: bug: tape->first_stage is NULL\n");
return;
}
if (tape->active_stage == tape->first_stage) {
printk(KERN_ERR "ide-tape: bug: Trying to free our active "
"pipeline stage\n");
return;
}
stage = tape->first_stage;
tape->first_stage = stage->next;
idetape_kfree_stage(tape, stage);
tape->nr_stages--;
if (tape->first_stage == NULL) {
tape->last_stage = NULL;
if (tape->next_stage != NULL)
printk(KERN_ERR "ide-tape: bug: tape->next_stage !="
" NULL\n");
if (tape->nr_stages)
printk(KERN_ERR "ide-tape: bug: nr_stages should be 0 "
"now\n");
}
}
/* /*
* This will free all the pipeline stages starting from new_last_stage->next * This will free all the pipeline stages starting from new_last_stage->next
* to the end of the list, and point tape->last_stage to new_last_stage. * to the end of the list, and point tape->last_stage to new_last_stage.
@ -762,7 +727,6 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects)
idetape_tape_t *tape = drive->driver_data; idetape_tape_t *tape = drive->driver_data;
unsigned long flags; unsigned long flags;
int error; int error;
int remove_stage = 0;
idetape_stage_t *active_stage; idetape_stage_t *active_stage;
debug_log(DBG_PROCS, "Enter %s\n", __func__); debug_log(DBG_PROCS, "Enter %s\n", __func__);
@ -790,7 +754,6 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects)
tape->active_data_rq = NULL; tape->active_data_rq = NULL;
tape->nr_pending_stages--; tape->nr_pending_stages--;
if (rq->cmd[0] & REQ_IDETAPE_WRITE) { if (rq->cmd[0] & REQ_IDETAPE_WRITE) {
remove_stage = 1;
if (error) { if (error) {
set_bit(IDETAPE_FLAG_PIPELINE_ERR, set_bit(IDETAPE_FLAG_PIPELINE_ERR,
&tape->flags); &tape->flags);
@ -831,8 +794,6 @@ static int idetape_end_request(ide_drive_t *drive, int uptodate, int nr_sects)
} }
ide_end_drive_cmd(drive, 0, 0); ide_end_drive_cmd(drive, 0, 0);
if (remove_stage)
idetape_remove_stage_head(drive);
if (tape->active_data_rq == NULL) if (tape->active_data_rq == NULL)
clear_bit(IDETAPE_FLAG_PIPELINE_ACTIVE, &tape->flags); clear_bit(IDETAPE_FLAG_PIPELINE_ACTIVE, &tape->flags);
spin_unlock_irqrestore(&tape->lock, flags); spin_unlock_irqrestore(&tape->lock, flags);
@ -1914,7 +1875,6 @@ static int __idetape_discard_read_pipeline(ide_drive_t *drive)
cnt += rq_ptr->nr_sectors - rq_ptr->current_nr_sectors; cnt += rq_ptr->nr_sectors - rq_ptr->current_nr_sectors;
if (rq_ptr->errors == IDETAPE_ERROR_FILEMARK) if (rq_ptr->errors == IDETAPE_ERROR_FILEMARK)
++cnt; ++cnt;
idetape_remove_stage_head(drive);
} }
tape->nr_pending_stages = 0; tape->nr_pending_stages = 0;
tape->max_stages = tape->min_pipeline; tape->max_stages = tape->min_pipeline;