scsi_mq_uninit_cmnd is used to free the sg_tables, uninitialize the
command and delete it from the command list.
Export this function so it can be used from modular code to free the
memory allocated by scsi_init_io() if the caller of scsi_init_io() needs
to do error recovery.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@xxxxxxx>
---
drivers/scsi/scsi_lib.c | 9 ++++++---
include/scsi/scsi_cmnd.h | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ea327f320b7f..4646575a89d6 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -57,8 +57,6 @@ static struct kmem_cache *scsi_sense_cache;
static struct kmem_cache *scsi_sense_isadma_cache;
static DEFINE_MUTEX(scsi_sense_cache_mutex);
-static void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd);
-
static inline struct kmem_cache *
scsi_select_sense_cache(bool unchecked_isa_dma)
{
@@ -558,12 +556,17 @@ static void scsi_mq_free_sgtables(struct scsi_cmnd *cmd)
SCSI_INLINE_PROT_SG_CNT);
}
-static void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd)
+/**
+ * scsi_mq_uninit_cmd - uninitialize a SCSI command
+ * @cmd: the command to free
+ */
+void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd)
{
scsi_mq_free_sgtables(cmd);
scsi_uninit_cmd(cmd);
scsi_del_cmd_from_list(cmd);
}
+EXPORT_SYMBOL_GPL(scsi_mq_uninit_cmd);
/* Returns false when no more bytes to process, true if there are more */
static bool scsi_end_request(struct request *req, blk_status_t error,
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index a2849bb9cd19..65ff625db38b 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -167,6 +167,7 @@ extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
extern void scsi_kunmap_atomic_sg(void *virt);
extern blk_status_t scsi_init_io(struct scsi_cmnd *cmd);
+extern void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd);
#ifdef CONFIG_SCSI_DMA
extern int scsi_dma_map(struct scsi_cmnd *cmd);
--
2.24.1
