summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_os.c
diff options
context:
space:
mode:
authorGiridhar Malavali2019-04-02 23:24:32 +0200
committerMartin K. Petersen2019-04-04 05:45:58 +0200
commitb2d1453a45aa8477b1d33ee94a7694146bb8b340 (patch)
tree2acf196e28b2601b333ebeb4aef903482469b1cc /drivers/scsi/qla2xxx/qla_os.c
parentscsi: qla2xxx: Cleanup redundant qla2x00_abort_all_cmds during unload (diff)
downloadkernel-qcow2-linux-b2d1453a45aa8477b1d33ee94a7694146bb8b340.tar.gz
kernel-qcow2-linux-b2d1453a45aa8477b1d33ee94a7694146bb8b340.tar.xz
kernel-qcow2-linux-b2d1453a45aa8477b1d33ee94a7694146bb8b340.zip
scsi: qla2xxx: Fix driver unload when FC-NVMe LUNs are connected
This patch allows driver to unload using "modprobe -r" when FC-NVMe LUNs are connected. Signed-off-by: Giridhar Malavali <gmalavali@marvell.com> Signed-off-by: Himanshu Madhani <hmadhani@marvell.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_os.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 60f06a26899a..d49208c16928 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -6742,8 +6742,10 @@ qla2x00_timer(struct timer_list *t)
* FC-NVME
* see if the active AEN count has changed from what was last reported.
*/
- if (!vha->vp_idx && (atomic_read(&ha->nvme_active_aen_cnt) !=
- ha->nvme_last_rptd_aen) && ha->zio_mode == QLA_ZIO_MODE_6) {
+ if (!vha->vp_idx &&
+ (atomic_read(&ha->nvme_active_aen_cnt) != ha->nvme_last_rptd_aen) &&
+ ha->zio_mode == QLA_ZIO_MODE_6 &&
+ !ha->flags.host_shutting_down) {
ql_log(ql_log_info, vha, 0x3002,
"nvme: Sched: Set ZIO exchange threshold to %d.\n",
ha->nvme_last_rptd_aen);