scsi: always call notifier on async cancellation

This was found by code inspection.  If the request is cancelled twice,
the notifier is never called on the second cancellation request,
and hence for example a TMF might never finish.

All the calls in scsi_req_cancel_async are idempotent, so the change
is safe.

Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1450290827-30508-2-git-send-email-pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-12-16 19:33:44 +01:00
parent 8aad35f678
commit 36896bffd1

View File

@ -1759,9 +1759,6 @@ void scsi_req_cancel_async(SCSIRequest *req, Notifier *notifier)
if (notifier) { if (notifier) {
notifier_list_add(&req->cancel_notifiers, notifier); notifier_list_add(&req->cancel_notifiers, notifier);
} }
if (req->io_canceled) {
return;
}
scsi_req_ref(req); scsi_req_ref(req);
scsi_req_dequeue(req); scsi_req_dequeue(req);
req->io_canceled = true; req->io_canceled = true;