diff options
| author |   Nilesh Javali <njavali@marvell.com> | 2022-07-12 22:20:36 -0700 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2022-07-18 22:33:03 -0400 |
| commit | 5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3 (patch) | |
| tree | 28aeb27c32f09c17d7aaabc874e70964f43b3a66 /drivers/scsi/qla2xxx/qla_nvme.c | |
| parent | scsi: smartpqi: Update version to 2.1.18-045 (diff) | |
| download | wireguard-linux-5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3.tar.xz wireguard-linux-5bc7b01c513a4a9b4cfe306e8d1720cfcfd3b8a3.zip | |
scsi: Revert "scsi: qla2xxx: Fix disk failure to rediscover"
This fixes the regression of NVMe discovery failure during driver load
time.
This reverts commit 6a45c8e137d4e2c72eecf1ac7cf64f2fdfcead99.
Link: https://lore.kernel.org/r/20220713052045.10683-2-njavali@marvell.com
Cc: stable@vger.kernel.org
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_nvme.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_nvme.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c index 87c9404aa401..7450c3458be7 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.c +++ b/drivers/scsi/qla2xxx/qla_nvme.c @@ -37,11 +37,6 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport) (fcport->nvme_flag & NVME_FLAG_REGISTERED)) return 0; - if (atomic_read(&fcport->state) == FCS_ONLINE) - return 0; - - qla2x00_set_fcport_state(fcport, FCS_ONLINE); - fcport->nvme_flag &= ~NVME_FLAG_RESETTING; memset(&req, 0, sizeof(struct nvme_fc_port_info)); |