diff options
| author |   Mike Christie <michaelc@cs.wisc.edu> | 2010-01-12 22:48:00 -0600 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@suse.de> | 2010-02-17 09:55:22 -0600 |
| commit | fee099b278894a1c7383a08cb3c62a5b62a134e8 (patch) | |
| tree | 57e7766a34deaa67fbda1f38b5fdc4cf3973dd25 /drivers/scsi/libiscsi_tcp.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff) | |
| download | linux-dev-fee099b278894a1c7383a08cb3c62a5b62a134e8.tar.xz linux-dev-fee099b278894a1c7383a08cb3c62a5b62a134e8.zip | |
[SCSI] iscsi_tcp regression: remove bogus warn on in write path
An empty r2tqueue is a valid state. It just means that we have
processed all that there was to do. This patch removes the WARN_ON
that was added when the kfifo changes were merged.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/libiscsi_tcp.c')
| -rw-r--r-- | drivers/scsi/libiscsi_tcp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c index db6856c138fc..4ad87fd74ddd 100644 --- a/drivers/scsi/libiscsi_tcp.c +++ b/drivers/scsi/libiscsi_tcp.c @@ -992,12 +992,10 @@ static struct iscsi_r2t_info *iscsi_tcp_get_curr_r2t(struct iscsi_task *task) if (r2t == NULL) { if (kfifo_out(&tcp_task->r2tqueue, (void *)&tcp_task->r2t, sizeof(void *)) != - sizeof(void *)) { - WARN_ONCE(1, "unexpected fifo state"); + sizeof(void *)) r2t = NULL; - } - - r2t = tcp_task->r2t; + else + r2t = tcp_task->r2t; } spin_unlock_bh(&session->lock); } |