Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e65cc16 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

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: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0300b114

drivers/target/iscsi/cxgbit/cxgbit.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/target/iscsi/cxgbit/cxgbit_ddp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/target/iscsi/cxgbit/cxgbit_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/target/iscsi/iscsi_target_util.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

include/target/iscsi/iscsi_transport.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *,