From: Andy Grover <agrover@xxxxxxxxxx>
If t_mem_bidi_list is empty, iterating over it without checking
if it's empty, or that t_tasks_se_bidi_num is nonzero, will still
be correct. Also applies to needing to check t_tasks_se_num before
looping.
Zero out t_tasks_se_bidi_num to match handling of t_tasks_se_num.
Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
---
drivers/target/target_core_transport.c | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index f2849ad..d0cd601 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -3826,9 +3826,6 @@ static inline void transport_free_pages(struct se_cmd *cmd)
if (cmd->se_cmd_flags & SCF_CMD_PASSTHROUGH_NOALLOC)
return;
- if (!(cmd->t_task.t_tasks_se_num))
- return;
-
list_for_each_entry_safe(se_mem, se_mem_tmp,
&cmd->t_task.t_mem_list, se_list) {
/*
@@ -3841,23 +3838,21 @@ static inline void transport_free_pages(struct se_cmd *cmd)
list_del(&se_mem->se_list);
kmem_cache_free(se_mem_cache, se_mem);
}
+ cmd->t_task.t_tasks_se_num = 0;
- if (!list_empty(&cmd->t_task.t_mem_bidi_list) && cmd->t_task.t_tasks_se_bidi_num) {
- list_for_each_entry_safe(se_mem, se_mem_tmp,
- &cmd->t_task.t_mem_bidi_list, se_list) {
- /*
- * We only release call __free_page(struct se_mem->se_page) when
- * SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC is NOT in use,
- */
- if (free_page)
- __free_page(se_mem->se_page);
+ list_for_each_entry_safe(se_mem, se_mem_tmp,
+ &cmd->t_task.t_mem_bidi_list, se_list) {
+ /*
+ * We only release call __free_page(struct se_mem->se_page) when
+ * SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC is NOT in use,
+ */
+ if (free_page)
+ __free_page(se_mem->se_page);
- list_del(&se_mem->se_list);
- kmem_cache_free(se_mem_cache, se_mem);
- }
+ list_del(&se_mem->se_list);
+ kmem_cache_free(se_mem_cache, se_mem);
}
-
- cmd->t_task.t_tasks_se_num = 0;
+ cmd->t_task.t_tasks_se_bidi_num = 0;
}
static inline void transport_release_tasks(struct se_cmd *cmd)
--
1.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
