Commit 5b9851b5 authored by Mark Haverkamp's avatar Mark Haverkamp Committed by James Bottomley

[SCSI] aacraid: remove unneeded list

Received From Mark Salyzyn

The queue tracking is just not being used, not even for debugging. Information
about outstanding commands can be acquired from the scsi structures.
Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent df3b7668
...@@ -563,7 +563,6 @@ struct aac_queue { ...@@ -563,7 +563,6 @@ struct aac_queue {
spinlock_t lockdata; /* Actual lock (used only on one side of the lock) */ spinlock_t lockdata; /* Actual lock (used only on one side of the lock) */
struct list_head cmdq; /* A queue of FIBs which need to be prcessed by the FS thread. This is */ struct list_head cmdq; /* A queue of FIBs which need to be prcessed by the FS thread. This is */
/* only valid for command queues which receive entries from the adapter. */ /* only valid for command queues which receive entries from the adapter. */
struct list_head pendingq; /* A queue of outstanding fib's to the adapter. */
u32 numpending; /* Number of entries on outstanding queue. */ u32 numpending; /* Number of entries on outstanding queue. */
struct aac_dev * dev; /* Back pointer to adapter structure */ struct aac_dev * dev; /* Back pointer to adapter structure */
}; };
...@@ -826,7 +825,6 @@ struct fib { ...@@ -826,7 +825,6 @@ struct fib {
* The following is used to put this fib context onto the * The following is used to put this fib context onto the
* Outstanding I/O queue. * Outstanding I/O queue.
*/ */
struct list_head queue;
/* /*
* And for the internal issue/reply queues (we may be able * And for the internal issue/reply queues (we may be able
* to merge these two) * to merge these two)
......
...@@ -159,7 +159,6 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem, ...@@ -159,7 +159,6 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,
{ {
q->numpending = 0; q->numpending = 0;
q->dev = dev; q->dev = dev;
INIT_LIST_HEAD(&q->pendingq);
init_waitqueue_head(&q->cmdready); init_waitqueue_head(&q->cmdready);
INIT_LIST_HEAD(&q->cmdq); INIT_LIST_HEAD(&q->cmdq);
init_waitqueue_head(&q->qfull); init_waitqueue_head(&q->qfull);
......
...@@ -472,7 +472,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, ...@@ -472,7 +472,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
spin_lock_irqsave(q->lock, qflags); spin_lock_irqsave(q->lock, qflags);
if (dev->new_comm_interface) { if (dev->new_comm_interface) {
unsigned long count = 10000000L; /* 50 seconds */ unsigned long count = 10000000L; /* 50 seconds */
list_add_tail(&fibptr->queue, &q->pendingq);
q->numpending++; q->numpending++;
spin_unlock_irqrestore(q->lock, qflags); spin_unlock_irqrestore(q->lock, qflags);
while (aac_adapter_send(fibptr) != 0) { while (aac_adapter_send(fibptr) != 0) {
...@@ -481,7 +480,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, ...@@ -481,7 +480,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
spin_unlock_irqrestore(&fibptr->event_lock, flags); spin_unlock_irqrestore(&fibptr->event_lock, flags);
spin_lock_irqsave(q->lock, qflags); spin_lock_irqsave(q->lock, qflags);
q->numpending--; q->numpending--;
list_del(&fibptr->queue);
spin_unlock_irqrestore(q->lock, qflags); spin_unlock_irqrestore(q->lock, qflags);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -492,7 +490,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, ...@@ -492,7 +490,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
unsigned long nointr = 0; unsigned long nointr = 0;
aac_queue_get( dev, &index, AdapNormCmdQueue, hw_fib, 1, fibptr, &nointr); aac_queue_get( dev, &index, AdapNormCmdQueue, hw_fib, 1, fibptr, &nointr);
list_add_tail(&fibptr->queue, &q->pendingq);
q->numpending++; q->numpending++;
*(q->headers.producer) = cpu_to_le32(index + 1); *(q->headers.producer) = cpu_to_le32(index + 1);
spin_unlock_irqrestore(q->lock, qflags); spin_unlock_irqrestore(q->lock, qflags);
...@@ -520,7 +517,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, ...@@ -520,7 +517,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
if (--count == 0) { if (--count == 0) {
spin_lock_irqsave(q->lock, qflags); spin_lock_irqsave(q->lock, qflags);
q->numpending--; q->numpending--;
list_del(&fibptr->queue);
spin_unlock_irqrestore(q->lock, qflags); spin_unlock_irqrestore(q->lock, qflags);
if (wait == -1) { if (wait == -1) {
printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n" printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n"
......
...@@ -86,7 +86,6 @@ unsigned int aac_response_normal(struct aac_queue * q) ...@@ -86,7 +86,6 @@ unsigned int aac_response_normal(struct aac_queue * q)
* the fib timed out. * the fib timed out.
*/ */
if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) { if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
list_del(&fib->queue);
dev->queues->queue[AdapNormCmdQueue].numpending--; dev->queues->queue[AdapNormCmdQueue].numpending--;
} else { } else {
printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags); printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
...@@ -284,7 +283,6 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index) ...@@ -284,7 +283,6 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
return 0; return 0;
} }
list_del(&fib->queue);
dev->queues->queue[AdapNormCmdQueue].numpending--; dev->queues->queue[AdapNormCmdQueue].numpending--;
if (fast) { if (fast) {
......
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