> > Hey Manish, > > > > Here is a lightly tested patch. > > > > > > diff --git a/drivers/scsi/qedi/qedi_gbl.h > > b/drivers/scsi/qedi/qedi_gbl.h index > > fb44a282613e..9f8e8ef405a1 100644 > > --- a/drivers/scsi/qedi/qedi_gbl.h > > +++ b/drivers/scsi/qedi/qedi_gbl.h > > @@ -72,6 +72,5 @@ void qedi_remove_sysfs_ctx_attr(struct qedi_ctx > > *qedi); void qedi_clearsq(struct qedi_ctx *qedi, > > struct qedi_conn *qedi_conn, > > struct iscsi_task *task); > > -void qedi_clear_session_ctx(struct iscsi_cls_session *cls_sess); > > > > #endif > > diff --git a/drivers/scsi/qedi/qedi_iscsi.c > > b/drivers/scsi/qedi/qedi_iscsi.c index > > bf581ecea897..97f83760da88 100644 > > --- a/drivers/scsi/qedi/qedi_iscsi.c > > +++ b/drivers/scsi/qedi/qedi_iscsi.c > > @@ -1659,23 +1659,6 @@ void qedi_process_iscsi_error(struct > > qedi_endpoint *ep, > > qedi_start_conn_recovery(qedi_conn->qedi, qedi_conn); } > > > > -void qedi_clear_session_ctx(struct iscsi_cls_session *cls_sess) -{ > > - struct iscsi_session *session = cls_sess->dd_data; > > - struct iscsi_conn *conn = session->leadconn; > > - struct qedi_conn *qedi_conn = conn->dd_data; > > - > > - if (iscsi_is_session_online(cls_sess)) { > > - if (conn) > > - iscsi_suspend_queue(conn); > > - qedi_ep_disconnect(qedi_conn->iscsi_ep); > > - } > > - > > - qedi_conn_destroy(qedi_conn->cls_conn); > > - > > - qedi_session_destroy(cls_sess); > > -} > > - > > void qedi_process_tcp_error(struct qedi_endpoint *ep, > > struct iscsi_eqe_data *data) > > { > > diff --git a/drivers/scsi/qedi/qedi_main.c > > b/drivers/scsi/qedi/qedi_main.c index > > edf915432704..0b0acb827071 100644 > > --- a/drivers/scsi/qedi/qedi_main.c > > +++ b/drivers/scsi/qedi/qedi_main.c > > @@ -2417,11 +2417,9 @@ static void __qedi_remove(struct pci_dev *pdev, > > int > > mode) > > int rval; > > u16 retry = 10; > > > > - if (mode == QEDI_MODE_SHUTDOWN) > > - iscsi_host_for_each_session(qedi->shost, > > - qedi_clear_session_ctx); > > - > > if (mode == QEDI_MODE_NORMAL || mode == > > QEDI_MODE_SHUTDOWN) { > > + iscsi_host_remove(qedi->shost); > > + > > if (qedi->tmf_thread) { > > flush_workqueue(qedi->tmf_thread); > > destroy_workqueue(qedi->tmf_thread); > > @@ -2482,7 +2480,6 @@ static void __qedi_remove(struct pci_dev *pdev, > > int > > mode) > > if (qedi->boot_kset) > > iscsi_boot_destroy_kset(qedi->boot_kset); > > > > - iscsi_host_remove(qedi->shost); > > iscsi_host_free(qedi->shost); > > } > > } > > Agree, with your code changes. I will run BFS + shutdown tests with this change, > and let you know in case hit any issue. > > Thanks, > Manish Mike, No issue observed in mentioned tests. Thanks, Manish