On 7/26/19 9:07 AM, Himanshu Madhani wrote:
  static void qla24xx_abort_sp_done(void *ptr, int res)
@@ -109,7 +122,8 @@ static void qla24xx_abort_sp_done(void *ptr, int res)
        srb_t *sp = ptr;
        struct srb_iocb *abt = &sp->u.iocb_cmd;
- if (del_timer(&sp->u.iocb_cmd.timer)) {
+       if ((res == QLA_OS_TIMER_EXPIRED) ||
+           del_timer(&sp->u.iocb_cmd.timer)) {
                if (sp->flags & SRB_WAKEUP_ON_COMP)
                        complete(&abt->u.abt.comp);
                else

A better fix is probably to ignore the return value of del_timer() - see also "[PATCH 20/20] qla2xxx: Fix qla24xx_abort_sp_done()" (https://www.spinics.net/lists/linux-scsi/msg130664.html).

Anyway, I'm fine with this and the other 14 patches going upstream. I can rebase my patches on top of this patch series.

Bart.


Reply via email to