The patch titled
iscsi_tcp regression: remove bogus warn on in write path
has been added to the -mm tree. Its filename is
iscsi_tcp-regression-remove-bogus-warn-on-in-write-path.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: iscsi_tcp regression: remove bogus warn on in write path
From: Mike Christie <michaelc@xxxxxxxxxxx>
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@xxxxxxxxxxx>
Cc: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/libiscsi_tcp.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff -puN drivers/scsi/libiscsi_tcp.c~iscsi_tcp-regression-remove-bogus-warn-on-in-write-path drivers/scsi/libiscsi_tcp.c
--- a/drivers/scsi/libiscsi_tcp.c~iscsi_tcp-regression-remove-bogus-warn-on-in-write-path
+++ a/drivers/scsi/libiscsi_tcp.c
@@ -992,12 +992,10 @@ static struct iscsi_r2t_info *iscsi_tcp_
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);
}
_
Patches currently in -mm which might be from michaelc@xxxxxxxxxxx are
linux-next.patch
iscsi_tcp-regression-remove-bogus-warn-on-in-write-path.patch
drivers-scsi-remove-uses-of-nipquad-use-%pi4.patch
drivers-firmware-iscsi_ibftc-remove-nipquad_fmt-use-%pi4.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
