From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hannes Reinecke Subject: [PATCH 14/16] scsi_dh: invoke callback if ->activate is not present Date: Fri, 20 Dec 2013 13:13:39 +0100 Message-ID: <1387541621-54967-15-git-send-email-hare@suse.de> References: <1387541621-54967-1-git-send-email-hare@suse.de> Return-path: Received: from cantor2.suse.de ([195.135.220.15]:46618 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756887Ab3LTMNp (ORCPT ); Fri, 20 Dec 2013 07:13:45 -0500 In-Reply-To: <1387541621-54967-1-git-send-email-hare@suse.de> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: James Bottomley Cc: linux-scsi@vger.kernel.org, Sean Stewart , Martin George , Hannes Reinecke When ->activate isn't present we still need to invoke the callbacks, otherwise the system might stall. Signed-off-by: Hannes Reinecke --- drivers/scsi/device_handler/scsi_dh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c index ae7f399..a90380f 100644 --- a/drivers/scsi/device_handler/scsi_dh.c +++ b/drivers/scsi/device_handler/scsi_dh.c @@ -411,7 +411,7 @@ int scsi_dh_activate(struct request_queue *q, activate_complete fn, void *data) err = SCSI_DH_DEV_OFFLINED; spin_unlock_irqrestore(q->queue_lock, flags); - if (err != SCSI_DH_OK) { + if (err != SCSI_DH_OK || !scsi_dh->activate) { if (fn) fn(data, err); goto out; -- 1.7.12.4