From 2aa74d8ba9af69876d0b62587e708b3316813198 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 14 Apr 2020 02:09:52 +0900 Subject: [PATCH] lib/scsi: Inline _scsi_lun_execute_mgmt_task() into the caller function Inline _scsi_lun_execute_mgmt_task() into the caller function spdk_scsi_lun_execute_mgmt_task() as another preparation to the following patches to avoid using double underscores as the prefix of the function name. Signed-off-by: Shuhei Matsumoto Change-Id: I3c282fff133dfe7afc70c374a2186c14d1eb766c Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1829 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- lib/scsi/lun.c | 53 ++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/lib/scsi/lun.c b/lib/scsi/lun.c index c8b563f3f..dcf20a0af 100644 --- a/lib/scsi/lun.c +++ b/lib/scsi/lun.c @@ -116,10 +116,30 @@ spdk_scsi_lun_complete_reset_task(struct spdk_scsi_lun *lun, struct spdk_scsi_ta scsi_lun_complete_mgmt_task(lun, task); } -static void -_scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun, - struct spdk_scsi_task *task) +void +spdk_scsi_lun_append_mgmt_task(struct spdk_scsi_lun *lun, + struct spdk_scsi_task *task) { + TAILQ_INSERT_TAIL(&lun->pending_mgmt_tasks, task, scsi_link); +} + +void +spdk_scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun) +{ + struct spdk_scsi_task *task; + + if (!TAILQ_EMPTY(&lun->mgmt_tasks)) { + return; + } + + task = TAILQ_FIRST(&lun->pending_mgmt_tasks); + if (spdk_likely(task == NULL)) { + /* Try to execute all pending tasks */ + spdk_scsi_lun_execute_tasks(lun); + return; + } + TAILQ_REMOVE(&lun->pending_mgmt_tasks, task, scsi_link); + TAILQ_INSERT_TAIL(&lun->mgmt_tasks, task, scsi_link); if (lun->removed) { @@ -157,33 +177,6 @@ _scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun, scsi_lun_complete_mgmt_task(lun, task); } -void -spdk_scsi_lun_append_mgmt_task(struct spdk_scsi_lun *lun, - struct spdk_scsi_task *task) -{ - TAILQ_INSERT_TAIL(&lun->pending_mgmt_tasks, task, scsi_link); -} - -void -spdk_scsi_lun_execute_mgmt_task(struct spdk_scsi_lun *lun) -{ - struct spdk_scsi_task *task; - - if (!TAILQ_EMPTY(&lun->mgmt_tasks)) { - return; - } - - task = TAILQ_FIRST(&lun->pending_mgmt_tasks); - if (spdk_likely(task == NULL)) { - /* Try to execute all pending tasks */ - spdk_scsi_lun_execute_tasks(lun); - return; - } - TAILQ_REMOVE(&lun->pending_mgmt_tasks, task, scsi_link); - - _scsi_lun_execute_mgmt_task(lun, task); -} - static void _scsi_lun_execute_task(struct spdk_scsi_lun *lun, struct spdk_scsi_task *task) {