[30/34] target: Inline transport_put_cmd()

Commit Message

Bart Van Assche Jan. 25, 2017, 11:36 p.m. UTC

The transport_put_cmd() function consists of two lines of code.
Due to previous patches only two callers are left. Hence
inline this function.

Signed-off-by: Bart Van Assche <[e-mail]>
Cc: Christoph Hellwig <[e-mail]>
Cc: Andy Grover <[e-mail]>
Cc: David Disseldorp <[e-mail]>
---
 drivers/target/target_core_transport.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

Comments

Hannes Reinecke Jan. 26, 2017, 8:36 a.m. UTC | #1

On 01/26/2017 12:36 AM, Bart Van Assche wrote:
> The transport_put_cmd() function consists of two lines of code.
> Due to previous patches only two callers are left. Hence
> inline this function.
> 
> Signed-off-by: Bart Van Assche <[e-mail]>
> Cc: Christoph Hellwig <[e-mail]>
> Cc: Andy Grover <[e-mail]>
> Cc: David Disseldorp <[e-mail]>
> ---
>  drivers/target/target_core_transport.c | 22 +++-------------------
>  1 file changed, 3 insertions(+), 19 deletions(-)
> 
Reviewed-by: Hannes Reinecke <[e-mail]>

Cheers,

Hannes

Patch

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 0fb46c9ce449..1dde88b0c2c8 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -66,7 +66,6 @@  struct kmem_cache *t10_alua_lba_map_mem_cache;
 static void transport_complete_task_attr(struct se_cmd *cmd);
 static void transport_handle_queue_full(struct se_cmd *cmd,
 		struct se_device *dev);
-static int transport_put_cmd(struct se_cmd *cmd);
 static void target_complete_ok_work(struct work_struct *work);
 
 int init_se_kmem_caches(void)
@@ -689,7 +688,7 @@  static void transport_handle_abort(struct se_cmd *cmd)
 		 * commands" in SAM.
 		 */
 		if (transport_cmd_check_stop_to_fabric(cmd) == 0 && ack_kref)
-			transport_put_cmd(cmd);
+			target_put_sess_cmd(cmd);
 	}
 }
 
@@ -2250,22 +2249,6 @@  static inline void transport_free_pages(struct se_cmd *cmd)
 	cmd->t_bidi_data_nents = 0;
 }
 
-/**
- * transport_put_cmd - release a reference to a command
- * @cmd:       command to release
- *
- * This routine releases our reference to the command and frees it if possible.
- */
-static int transport_put_cmd(struct se_cmd *cmd)
-{
-	BUG_ON(!cmd->se_tfo);
-	/*
-	 * If this cmd has been setup with target_get_sess_cmd(), drop
-	 * the kref and call ->release_cmd() in kref callback.
-	 */
-	return target_put_sess_cmd(cmd);
-}
-
 void *transport_kmap_data_sg(struct se_cmd *cmd)
 {
 	struct scatterlist *sg = cmd->t_data_sg;
@@ -2513,7 +2496,8 @@  int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
 		if (cmd->se_lun)
 			transport_lun_remove_cmd(cmd);
 	}
-	return transport_put_cmd(cmd);
+	BUG_ON(!cmd->se_tfo);
+	return target_put_sess_cmd(cmd);
 }
 EXPORT_SYMBOL(transport_generic_free_cmd);