Skip to content

L
linux-davinci
Commit 55a5d291 authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files
Options

ide-tape: remove IDETAPE_DEBUG_BUGS 

Signed-off-by: default avatarBorislav Petkov <bbpetkov@yahoo.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent f79f93a2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 41 deletions
drivers/ide/ide-tape.c
View file @ 55a5d291
...@@ -107,8 +107,6 @@ typedef struct os_dat_s { ...@@ -107,8 +107,6 @@ typedef struct os_dat_s {
* The following are used to debug the driver: * The following are used to debug the driver:
* *
* Setting IDETAPE_DEBUG_LOG to 1 will log driver flow control. * Setting IDETAPE_DEBUG_LOG to 1 will log driver flow control.
* Setting IDETAPE_DEBUG_BUGS to 1 will enable self-sanity checks in
* some places.
* *
* Setting them to 0 will restore normal operation mode: * Setting them to 0 will restore normal operation mode:
* *
...@@ -121,7 +119,6 @@ typedef struct os_dat_s { ...@@ -121,7 +119,6 @@ typedef struct os_dat_s {
* esthetic. * esthetic.
*/ */
#define IDETAPE_DEBUG_LOG 0 #define IDETAPE_DEBUG_LOG 0
#define IDETAPE_DEBUG_BUGS 1
/* /*
* After each failed packet command we issue a request sense command * After each failed packet command we issue a request sense command
...@@ -847,14 +844,12 @@ static void idetape_input_buffers (ide_drive_t *drive, idetape_pc_t *pc, unsigne ...@@ -847,14 +844,12 @@ static void idetape_input_buffers (ide_drive_t *drive, idetape_pc_t *pc, unsigne
int count; int count;
while (bcount) { while (bcount) {
#if IDETAPE_DEBUG_BUGS
if (bh == NULL) { if (bh == NULL) {
printk(KERN_ERR "ide-tape: bh == NULL in " printk(KERN_ERR "ide-tape: bh == NULL in "
"idetape_input_buffers\n"); "idetape_input_buffers\n");
idetape_discard_data(drive, bcount); idetape_discard_data(drive, bcount);
return; return;
} }
#endif /* IDETAPE_DEBUG_BUGS */
count = min((unsigned int)(bh->b_size - atomic_read(&bh->b_count)), bcount); count = min((unsigned int)(bh->b_size - atomic_read(&bh->b_count)), bcount);
HWIF(drive)->atapi_input_bytes(drive, bh->b_data + atomic_read(&bh->b_count), count); HWIF(drive)->atapi_input_bytes(drive, bh->b_data + atomic_read(&bh->b_count), count);
bcount -= count; bcount -= count;
...@@ -874,13 +869,11 @@ static void idetape_output_buffers (ide_drive_t *drive, idetape_pc_t *pc, unsign ...@@ -874,13 +869,11 @@ static void idetape_output_buffers (ide_drive_t *drive, idetape_pc_t *pc, unsign
int count; int count;
while (bcount) { while (bcount) {
#if IDETAPE_DEBUG_BUGS
if (bh == NULL) { if (bh == NULL) {
printk(KERN_ERR "ide-tape: bh == NULL in " printk(KERN_ERR "ide-tape: bh == NULL in "
"idetape_output_buffers\n"); "idetape_output_buffers\n");
return; return;
} }
#endif /* IDETAPE_DEBUG_BUGS */
count = min((unsigned int)pc->b_count, (unsigned int)bcount); count = min((unsigned int)pc->b_count, (unsigned int)bcount);
HWIF(drive)->atapi_output_bytes(drive, pc->b_data, count); HWIF(drive)->atapi_output_bytes(drive, pc->b_data, count);
bcount -= count; bcount -= count;
...@@ -905,13 +898,11 @@ static void idetape_update_buffers (idetape_pc_t *pc) ...@@ -905,13 +898,11 @@ static void idetape_update_buffers (idetape_pc_t *pc)
if (test_bit(PC_WRITING, &pc->flags)) if (test_bit(PC_WRITING, &pc->flags))
return; return;
while (bcount) { while (bcount) {
#if IDETAPE_DEBUG_BUGS
if (bh == NULL) { if (bh == NULL) {
printk(KERN_ERR "ide-tape: bh == NULL in " printk(KERN_ERR "ide-tape: bh == NULL in "
"idetape_update_buffers\n"); "idetape_update_buffers\n");
return; return;
} }
#endif /* IDETAPE_DEBUG_BUGS */
count = min((unsigned int)bh->b_size, (unsigned int)bcount); count = min((unsigned int)bh->b_size, (unsigned int)bcount);
atomic_set(&bh->b_count, count); atomic_set(&bh->b_count, count);
if (atomic_read(&bh->b_count) == bh->b_size) if (atomic_read(&bh->b_count) == bh->b_size)
...@@ -1065,12 +1056,10 @@ static void idetape_active_next_stage (ide_drive_t *drive) ...@@ -1065,12 +1056,10 @@ static void idetape_active_next_stage (ide_drive_t *drive)
if (tape->debug_level >= 4) if (tape->debug_level >= 4)
printk(KERN_INFO "ide-tape: Reached idetape_active_next_stage\n"); printk(KERN_INFO "ide-tape: Reached idetape_active_next_stage\n");
#endif /* IDETAPE_DEBUG_LOG */ #endif /* IDETAPE_DEBUG_LOG */
#if IDETAPE_DEBUG_BUGS
if (stage == NULL) { if (stage == NULL) {
printk(KERN_ERR "ide-tape: bug: Trying to activate a non existing stage\n"); printk(KERN_ERR "ide-tape: bug: Trying to activate a non existing stage\n");
return; return;
} }
#endif /* IDETAPE_DEBUG_BUGS */
rq->rq_disk = tape->disk; rq->rq_disk = tape->disk;
rq->buffer = NULL; rq->buffer = NULL;
...@@ -1145,28 +1134,24 @@ static void idetape_remove_stage_head (ide_drive_t *drive) ...@@ -1145,28 +1134,24 @@ static void idetape_remove_stage_head (ide_drive_t *drive)
if (tape->debug_level >= 4) if (tape->debug_level >= 4)
printk(KERN_INFO "ide-tape: Reached idetape_remove_stage_head\n"); printk(KERN_INFO "ide-tape: Reached idetape_remove_stage_head\n");
#endif /* IDETAPE_DEBUG_LOG */ #endif /* IDETAPE_DEBUG_LOG */
#if IDETAPE_DEBUG_BUGS
if (tape->first_stage == NULL) { if (tape->first_stage == NULL) {
printk(KERN_ERR "ide-tape: bug: tape->first_stage is NULL\n"); printk(KERN_ERR "ide-tape: bug: tape->first_stage is NULL\n");
return; return;
} }
if (tape->active_stage == tape->first_stage) { if (tape->active_stage == tape->first_stage) {
printk(KERN_ERR "ide-tape: bug: Trying to free our active pipeline stage\n"); printk(KERN_ERR "ide-tape: bug: Trying to free our active pipeline stage\n");
return; return;
} }
#endif /* IDETAPE_DEBUG_BUGS */
stage = tape->first_stage; stage = tape->first_stage;
tape->first_stage = stage->next; tape->first_stage = stage->next;
idetape_kfree_stage(tape, stage); idetape_kfree_stage(tape, stage);
tape->nr_stages--; tape->nr_stages--;
if (tape->first_stage == NULL) { if (tape->first_stage == NULL) {
tape->last_stage = NULL; tape->last_stage = NULL;
#if IDETAPE_DEBUG_BUGS
if (tape->next_stage != NULL) if (tape->next_stage != NULL)
printk(KERN_ERR "ide-tape: bug: tape->next_stage != NULL\n"); printk(KERN_ERR "ide-tape: bug: tape->next_stage != NULL\n");
if (tape->nr_stages) if (tape->nr_stages)
printk(KERN_ERR "ide-tape: bug: nr_stages should be 0 now\n"); printk(KERN_ERR "ide-tape: bug: nr_stages should be 0 now\n");
#endif /* IDETAPE_DEBUG_BUGS */
} }
} }
...@@ -1654,13 +1639,11 @@ static ide_startstop_t idetape_issue_packet_command (ide_drive_t *drive, idetape ...@@ -1654,13 +1639,11 @@ static ide_startstop_t idetape_issue_packet_command (ide_drive_t *drive, idetape
int dma_ok = 0; int dma_ok = 0;
u16 bcount; u16 bcount;
#if IDETAPE_DEBUG_BUGS
if (tape->pc->c[0] == IDETAPE_REQUEST_SENSE_CMD && if (tape->pc->c[0] == IDETAPE_REQUEST_SENSE_CMD &&
pc->c[0] == IDETAPE_REQUEST_SENSE_CMD) { pc->c[0] == IDETAPE_REQUEST_SENSE_CMD) {
printk(KERN_ERR "ide-tape: possible ide-tape.c bug - " printk(KERN_ERR "ide-tape: possible ide-tape.c bug - "
"Two request sense in serial were issued\n"); "Two request sense in serial were issued\n");
} }
#endif /* IDETAPE_DEBUG_BUGS */
if (tape->failed_pc == NULL && pc->c[0] != IDETAPE_REQUEST_SENSE_CMD) if (tape->failed_pc == NULL && pc->c[0] != IDETAPE_REQUEST_SENSE_CMD)
tape->failed_pc = pc; tape->failed_pc = pc;
...@@ -1971,7 +1954,6 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, ...@@ -1971,7 +1954,6 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
tape->pc->c[0] == IDETAPE_REQUEST_SENSE_CMD) { tape->pc->c[0] == IDETAPE_REQUEST_SENSE_CMD) {
return idetape_issue_packet_command(drive, tape->failed_pc); return idetape_issue_packet_command(drive, tape->failed_pc);
} }
#if IDETAPE_DEBUG_BUGS
if (postponed_rq != NULL) if (postponed_rq != NULL)
if (rq != postponed_rq) { if (rq != postponed_rq) {
printk(KERN_ERR "ide-tape: ide-tape.c bug - " printk(KERN_ERR "ide-tape: ide-tape.c bug - "
...@@ -1979,7 +1961,6 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, ...@@ -1979,7 +1961,6 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
idetape_end_request(drive, 0, 0); idetape_end_request(drive, 0, 0);
return ide_stopped; return ide_stopped;
} }
#endif /* IDETAPE_DEBUG_BUGS */
tape->postponed_rq = NULL; tape->postponed_rq = NULL;
...@@ -2166,13 +2147,11 @@ static int idetape_copy_stage_from_user (idetape_tape_t *tape, idetape_stage_t * ...@@ -2166,13 +2147,11 @@ static int idetape_copy_stage_from_user (idetape_tape_t *tape, idetape_stage_t *
int ret = 0; int ret = 0;
while (n) { while (n) {
#if IDETAPE_DEBUG_BUGS
if (bh == NULL) { if (bh == NULL) {
printk(KERN_ERR "ide-tape: bh == NULL in " printk(KERN_ERR "ide-tape: bh == NULL in "
"idetape_copy_stage_from_user\n"); "idetape_copy_stage_from_user\n");
return 1; return 1;
} }
#endif /* IDETAPE_DEBUG_BUGS */
count = min((unsigned int)(bh->b_size - atomic_read(&bh->b_count)), (unsigned int)n); count = min((unsigned int)(bh->b_size - atomic_read(&bh->b_count)), (unsigned int)n);
if (copy_from_user(bh->b_data + atomic_read(&bh->b_count), buf, count)) if (copy_from_user(bh->b_data + atomic_read(&bh->b_count), buf, count))
ret = 1; ret = 1;
...@@ -2196,13 +2175,11 @@ static int idetape_copy_stage_to_user (idetape_tape_t *tape, char __user *buf, i ...@@ -2196,13 +2175,11 @@ static int idetape_copy_stage_to_user (idetape_tape_t *tape, char __user *buf, i
int ret = 0; int ret = 0;
while (n) { while (n) {
#if IDETAPE_DEBUG_BUGS
if (bh == NULL) { if (bh == NULL) {
printk(KERN_ERR "ide-tape: bh == NULL in " printk(KERN_ERR "ide-tape: bh == NULL in "
"idetape_copy_stage_to_user\n"); "idetape_copy_stage_to_user\n");
return 1; return 1;
} }
#endif /* IDETAPE_DEBUG_BUGS */
count = min(tape->b_count, n); count = min(tape->b_count, n);
if (copy_to_user(buf, tape->b_data, count)) if (copy_to_user(buf, tape->b_data, count))
ret = 1; ret = 1;
...@@ -2282,12 +2259,10 @@ static void idetape_wait_for_request (ide_drive_t *drive, struct request *rq) ...@@ -2282,12 +2259,10 @@ static void idetape_wait_for_request (ide_drive_t *drive, struct request *rq)
DECLARE_COMPLETION_ONSTACK(wait); DECLARE_COMPLETION_ONSTACK(wait);
idetape_tape_t *tape = drive->driver_data; idetape_tape_t *tape = drive->driver_data;
#if IDETAPE_DEBUG_BUGS
if (rq == NULL || !blk_special_request(rq)) { if (rq == NULL || !blk_special_request(rq)) {
printk (KERN_ERR "ide-tape: bug: Trying to sleep on non-valid request\n"); printk (KERN_ERR "ide-tape: bug: Trying to sleep on non-valid request\n");
return; return;
} }
#endif /* IDETAPE_DEBUG_BUGS */
rq->end_io_data = &wait; rq->end_io_data = &wait;
rq->end_io = blk_end_sync_rq; rq->end_io = blk_end_sync_rq;
spin_unlock_irq(&tape->spinlock); spin_unlock_irq(&tape->spinlock);
...@@ -2602,12 +2577,10 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int blocks, struct ...@@ -2602,12 +2577,10 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int blocks, struct
if (tape->debug_level >= 2) if (tape->debug_level >= 2)
printk(KERN_INFO "ide-tape: idetape_queue_rw_tail: cmd=%d\n",cmd); printk(KERN_INFO "ide-tape: idetape_queue_rw_tail: cmd=%d\n",cmd);
#endif /* IDETAPE_DEBUG_LOG */ #endif /* IDETAPE_DEBUG_LOG */
#if IDETAPE_DEBUG_BUGS
if (idetape_pipeline_active(tape)) { if (idetape_pipeline_active(tape)) {
printk(KERN_ERR "ide-tape: bug: the pipeline is active in idetape_queue_rw_tail\n"); printk(KERN_ERR "ide-tape: bug: the pipeline is active in idetape_queue_rw_tail\n");
return (0); return (0);
} }
#endif /* IDETAPE_DEBUG_BUGS */
idetape_init_rq(&rq, cmd); idetape_init_rq(&rq, cmd);
rq.rq_disk = tape->disk; rq.rq_disk = tape->disk;
...@@ -2792,8 +2765,7 @@ static void idetape_empty_write_pipeline (ide_drive_t *drive) ...@@ -2792,8 +2765,7 @@ static void idetape_empty_write_pipeline (ide_drive_t *drive)
idetape_tape_t *tape = drive->driver_data; idetape_tape_t *tape = drive->driver_data;
int blocks, min; int blocks, min;
struct idetape_bh *bh; struct idetape_bh *bh;
#if IDETAPE_DEBUG_BUGS
if (tape->chrdev_direction != idetape_direction_write) { if (tape->chrdev_direction != idetape_direction_write) {
printk(KERN_ERR "ide-tape: bug: Trying to empty write pipeline, but we are not writing.\n"); printk(KERN_ERR "ide-tape: bug: Trying to empty write pipeline, but we are not writing.\n");
return; return;
...@@ -2802,7 +2774,6 @@ static void idetape_empty_write_pipeline (ide_drive_t *drive) ...@@ -2802,7 +2774,6 @@ static void idetape_empty_write_pipeline (ide_drive_t *drive)
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->stage_size; tape->merge_stage_size = tape->stage_size;
} }
#endif /* IDETAPE_DEBUG_BUGS */
if (tape->merge_stage_size) { if (tape->merge_stage_size) {
blocks = tape->merge_stage_size / tape->tape_block_size; blocks = tape->merge_stage_size / tape->tape_block_size;
if (tape->merge_stage_size % tape->tape_block_size) { if (tape->merge_stage_size % tape->tape_block_size) {
...@@ -2847,7 +2818,6 @@ static void idetape_empty_write_pipeline (ide_drive_t *drive) ...@@ -2847,7 +2818,6 @@ static void idetape_empty_write_pipeline (ide_drive_t *drive)
* can be totally different on the next backup). * can be totally different on the next backup).
*/ */
tape->max_stages = tape->min_pipeline; tape->max_stages = tape->min_pipeline;
#if IDETAPE_DEBUG_BUGS
if (tape->first_stage != NULL || if (tape->first_stage != NULL ||
tape->next_stage != NULL || tape->next_stage != NULL ||
tape->last_stage != NULL || tape->last_stage != NULL ||
...@@ -2858,7 +2828,6 @@ static void idetape_empty_write_pipeline (ide_drive_t *drive) ...@@ -2858,7 +2828,6 @@ static void idetape_empty_write_pipeline (ide_drive_t *drive)
tape->first_stage, tape->next_stage, tape->first_stage, tape->next_stage,
tape->last_stage, tape->nr_stages); tape->last_stage, tape->nr_stages);
} }
#endif /* IDETAPE_DEBUG_BUGS */
} }
static void idetape_restart_speed_control (ide_drive_t *drive) static void idetape_restart_speed_control (ide_drive_t *drive)
...@@ -2889,12 +2858,10 @@ static int idetape_initiate_read (ide_drive_t *drive, int max_stages) ...@@ -2889,12 +2858,10 @@ static int idetape_initiate_read (ide_drive_t *drive, int max_stages)
idetape_empty_write_pipeline(drive); idetape_empty_write_pipeline(drive);
idetape_flush_tape_buffers(drive); idetape_flush_tape_buffers(drive);
} }
#if IDETAPE_DEBUG_BUGS
if (tape->merge_stage || tape->merge_stage_size) { if (tape->merge_stage || tape->merge_stage_size) {
printk (KERN_ERR "ide-tape: merge_stage_size should be 0 now\n"); printk (KERN_ERR "ide-tape: merge_stage_size should be 0 now\n");
tape->merge_stage_size = 0; tape->merge_stage_size = 0;
} }
#endif /* IDETAPE_DEBUG_BUGS */
if ((tape->merge_stage = __idetape_kmalloc_stage(tape, 0, 0)) == NULL) if ((tape->merge_stage = __idetape_kmalloc_stage(tape, 0, 0)) == NULL)
return -ENOMEM; return -ENOMEM;
tape->chrdev_direction = idetape_direction_read; tape->chrdev_direction = idetape_direction_read;
...@@ -2995,12 +2962,10 @@ static int idetape_add_chrdev_read_request (ide_drive_t *drive,int blocks) ...@@ -2995,12 +2962,10 @@ static int idetape_add_chrdev_read_request (ide_drive_t *drive,int blocks)
tape->pipeline_head++; tape->pipeline_head++;
calculate_speeds(drive); calculate_speeds(drive);
} }
#if IDETAPE_DEBUG_BUGS
if (bytes_read > blocks * tape->tape_block_size) { if (bytes_read > blocks * tape->tape_block_size) {
printk(KERN_ERR "ide-tape: bug: trying to return more bytes than requested\n"); printk(KERN_ERR "ide-tape: bug: trying to return more bytes than requested\n");
bytes_read = blocks * tape->tape_block_size; bytes_read = blocks * tape->tape_block_size;
} }
#endif /* IDETAPE_DEBUG_BUGS */
return (bytes_read); return (bytes_read);
} }
...@@ -3299,13 +3264,11 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf, ...@@ -3299,13 +3264,11 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf,
if (tape->chrdev_direction != idetape_direction_write) { if (tape->chrdev_direction != idetape_direction_write) {
if (tape->chrdev_direction == idetape_direction_read) if (tape->chrdev_direction == idetape_direction_read)
idetape_discard_read_pipeline(drive, 1); idetape_discard_read_pipeline(drive, 1);
#if IDETAPE_DEBUG_BUGS
if (tape->merge_stage || tape->merge_stage_size) { if (tape->merge_stage || tape->merge_stage_size) {
printk(KERN_ERR "ide-tape: merge_stage_size " printk(KERN_ERR "ide-tape: merge_stage_size "
"should be 0 now\n"); "should be 0 now\n");
tape->merge_stage_size = 0; tape->merge_stage_size = 0;
} }
#endif /* IDETAPE_DEBUG_BUGS */
if ((tape->merge_stage = __idetape_kmalloc_stage(tape, 0, 0)) == NULL) if ((tape->merge_stage = __idetape_kmalloc_stage(tape, 0, 0)) == NULL)
return -ENOMEM; return -ENOMEM;
tape->chrdev_direction = idetape_direction_write; tape->chrdev_direction = idetape_direction_write;
...@@ -3333,12 +3296,10 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf, ...@@ -3333,12 +3296,10 @@ static ssize_t idetape_chrdev_write (struct file *file, const char __user *buf,
if (tape->restart_speed_control_req) if (tape->restart_speed_control_req)
idetape_restart_speed_control(drive); idetape_restart_speed_control(drive);
if (tape->merge_stage_size) { if (tape->merge_stage_size) {
#if IDETAPE_DEBUG_BUGS
if (tape->merge_stage_size >= tape->stage_size) { if (tape->merge_stage_size >= tape->stage_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 = 0; tape->merge_stage_size = 0;
} }
#endif /* IDETAPE_DEBUG_BUGS */
actually_written = min((unsigned int)(tape->stage_size - tape->merge_stage_size), (unsigned int)count); actually_written = min((unsigned int)(tape->stage_size - tape->merge_stage_size), (unsigned int)count);
if (idetape_copy_stage_from_user(tape, tape->merge_stage, buf, actually_written)) if (idetape_copy_stage_from_user(tape, tape->merge_stage, buf, actually_written))
ret = -EFAULT; ret = -EFAULT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment