Commit fa282f6c authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Changpeng Liu
Browse files

vhost/scsi: don't clear svdev->poll_group 



Don't unset svdev->poll_group when the last session is
stopped, just keep the old reference in there. When
a session is started, a new poll group will be picked
and svdev->poll_group will get overwritten anyway.

This is just a cleanup that aligns the code for
making vhost_session_send_event() asynchronous.

Change-Id: Ibf145603fd7525a65c4304b0bb1828dcbe2b52cf
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467227


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 5f6f7edd

lib/vhost/vhost_scsi.c

+4 −23
Original line number Diff line number Diff line
@@ -1359,7 +1359,6 @@ vhost_scsi_start(struct spdk_vhost_session *vsession) 
{

	struct spdk_vhost_scsi_session *svsession = to_scsi_session(vsession);

	struct spdk_vhost_scsi_dev *svdev;

	int rc;



	svdev = to_scsi_dev(vsession->vdev);

	assert(svdev != NULL);
@@ -1369,15 +1368,8 @@ vhost_scsi_start(struct spdk_vhost_session *vsession) 
		svdev->poll_group = vhost_get_poll_group(svdev->vdev.cpumask);

	}



	rc = vhost_session_send_event(svdev->poll_group, vsession, vhost_scsi_start_cb,

				      3, "start session");

	if (rc != 0) {

		if (svdev->vdev.active_session_num == 0) {

			svdev->poll_group = NULL;

		}

	}



	return rc;

	return vhost_session_send_event(svdev->poll_group, vsession,

					vhost_scsi_start_cb, 3, "start session");

}



static int
@@ -1463,19 +1455,8 @@ vhost_scsi_stop_cb(struct spdk_vhost_dev *vdev, 
static int

vhost_scsi_stop(struct spdk_vhost_session *vsession)

{

	struct spdk_vhost_scsi_session *svsession = to_scsi_session(vsession);

	int rc;



	rc = vhost_session_send_event(vsession->poll_group, vsession,

	return vhost_session_send_event(vsession->poll_group, vsession,

					vhost_scsi_stop_cb, 3, "stop session");

	if (rc != 0) {

		return rc;

	}



	if (vsession->vdev->active_session_num == 0) {

		svsession->svdev->poll_group = NULL;

	}

	return 0;

}



static void