scsi: target/iscsi: Rename a function and a function pointer

Having both a function and a function pointer member with the same
name (iscsit_release_cmd) is confusing. Hence rename the function pointer
member.

Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/iscsi/cxgbit/cxgbit.h b/drivers/target/iscsi/cxgbit/cxgbit.h
index 417b9e66b0cd0b9017dfe67b3dd9bb60ae257e80..3cca22e19964dc107b50250cb058281f48bb3564 100644 (file)
--- a/drivers/target/iscsi/cxgbit/cxgbit.h
+++ b/drivers/target/iscsi/cxgbit/cxgbit.h
@@ -345,7 +345,7 @@ struct cxgbit_device *cxgbit_find_device(struct net_device *, u8 *);
 int cxgbit_ddp_init(struct cxgbit_device *);
 int cxgbit_setup_conn_pgidx(struct cxgbit_sock *, u32);
 int cxgbit_reserve_ttt(struct cxgbit_sock *, struct iscsi_cmd *);
-void cxgbit_release_cmd(struct iscsi_conn *, struct iscsi_cmd *);
+void cxgbit_unmap_cmd(struct iscsi_conn *, struct iscsi_cmd *);
 
 static inline
 struct cxgbi_ppm *cdev2ppm(struct cxgbit_device *cdev)

diff --git a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
index 76a262674c8dc7c4563fba8f6b570b6155d2d182..d57fd3ed3fa5fbb419267df58822d563621e3731 100644 (file)
--- a/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_ddp.c
@@ -263,7 +263,7 @@ cxgbit_get_r2t_ttt(struct iscsi_conn *conn, struct iscsi_cmd *cmd,
        r2t->targ_xfer_tag = ttinfo->tag;
 }
 
-void cxgbit_release_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
+void cxgbit_unmap_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
 {
        struct cxgbit_cmd *ccmd = iscsit_priv_cmd(cmd);
 

diff --git a/drivers/target/iscsi/cxgbit/cxgbit_main.c b/drivers/target/iscsi/cxgbit/cxgbit_main.c
index c011c826fc26d70c523c82e3f6c0cbc152e15c6e..4a7bb0b49d17ac3e81e6e88bb1bb2d0ba0beac9c 100644 (file)
--- a/drivers/target/iscsi/cxgbit/cxgbit_main.c
+++ b/drivers/target/iscsi/cxgbit/cxgbit_main.c
@@ -678,7 +678,7 @@ static struct iscsit_transport cxgbit_transport = {
        .iscsit_get_r2t_ttt     = cxgbit_get_r2t_ttt,
        .iscsit_get_rx_pdu      = cxgbit_get_rx_pdu,
        .iscsit_validate_params = cxgbit_validate_params,
-       .iscsit_release_cmd     = cxgbit_release_cmd,
+       .iscsit_unmap_cmd       = cxgbit_unmap_cmd,
        .iscsit_aborted_task    = iscsit_aborted_task,
        .iscsit_get_sup_prot_ops = cxgbit_get_sup_prot_ops,
 };

diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c
index 58886d4b33cb77c6630493791a4b0876e213e3cf..3ac494f63a0b89f32bec5ab0d7f6a3a7cd569591 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_util.c
+++ b/drivers/target/iscsi/iscsi_target_util.c
@@ -760,8 +760,8 @@ void __iscsit_free_cmd(struct iscsi_cmd *cmd, bool check_queues)
                iscsit_remove_cmd_from_response_queue(cmd, conn);
        }
 
-       if (conn && conn->conn_transport->iscsit_release_cmd)
-               conn->conn_transport->iscsit_release_cmd(conn, cmd);
+       if (conn && conn->conn_transport->iscsit_unmap_cmd)
+               conn->conn_transport->iscsit_unmap_cmd(conn, cmd);
 }
 
 void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown)

diff --git a/include/target/iscsi/iscsi_transport.h b/include/target/iscsi/iscsi_transport.h
index 8b4b8ce2c1aeba29721e3a436bf5758462475f24..75bee29fd7dd5476e05e413479c49b41b90cd53c 100644 (file)
--- a/include/target/iscsi/iscsi_transport.h
+++ b/include/target/iscsi/iscsi_transport.h
@@ -26,7 +26,7 @@ struct iscsit_transport {
        void (*iscsit_aborted_task)(struct iscsi_conn *, struct iscsi_cmd *);
        int (*iscsit_xmit_pdu)(struct iscsi_conn *, struct iscsi_cmd *,
                               struct iscsi_datain_req *, const void *, u32);
-       void (*iscsit_release_cmd)(struct iscsi_conn *, struct iscsi_cmd *);
+       void (*iscsit_unmap_cmd)(struct iscsi_conn *, struct iscsi_cmd *);
        void (*iscsit_get_rx_pdu)(struct iscsi_conn *);
        int (*iscsit_validate_params)(struct iscsi_conn *);
        void (*iscsit_get_r2t_ttt)(struct iscsi_conn *, struct iscsi_cmd *,