Commit 4b9f8ce4 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: iscsi: Rename iscsi_conn_queue_work() 

Rename iscsi_conn_queue_work() to iscsi_conn_queue_xmit() to reflect that
it handles queueing of xmits only.

Link: https://lore.kernel.org/r/20220616224557.115234-2-michael.christie@oracle.com


Reviewed-by: default avatarLee Duncan <lduncan@suse.com>
Reviewed-by: default avatarWu Bo <wubo40@huawei.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 31500e90

drivers/scsi/cxgbi/libcxgbi.c

+1 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ void cxgbi_conn_tx_open(struct cxgbi_sock *csk) 
	if (conn) {

		log_debug(1 << CXGBI_DBG_SOCK,

			"csk 0x%p, cid %d.\n", csk, conn->id);

		iscsi_conn_queue_work(conn);

		iscsi_conn_queue_xmit(conn);

	}

}

EXPORT_SYMBOL_GPL(cxgbi_conn_tx_open);

drivers/scsi/iscsi_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void iscsi_sw_tcp_write_space(struct sock *sk) 
	old_write_space(sk);



	ISCSI_SW_TCP_DBG(conn, "iscsi_write_space\n");

	iscsi_conn_queue_work(conn);

	iscsi_conn_queue_xmit(conn);

}



static void iscsi_sw_tcp_conn_set_callbacks(struct iscsi_conn *conn)

drivers/scsi/libiscsi.c

+6 −6
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ MODULE_PARM_DESC(debug_libiscsi_eh, 
				"%s " dbg_fmt, __func__, ##arg);	\

	} while (0);



inline void iscsi_conn_queue_work(struct iscsi_conn *conn)

inline void iscsi_conn_queue_xmit(struct iscsi_conn *conn)

{

	struct Scsi_Host *shost = conn->session->host;

	struct iscsi_host *ihost = shost_priv(shost);
@@ -91,7 +91,7 @@ inline void iscsi_conn_queue_work(struct iscsi_conn *conn) 
	if (ihost->workq)

		queue_work(ihost->workq, &conn->xmitwork);

}

EXPORT_SYMBOL_GPL(iscsi_conn_queue_work);

EXPORT_SYMBOL_GPL(iscsi_conn_queue_xmit);



static void __iscsi_update_cmdsn(struct iscsi_session *session,

				 uint32_t exp_cmdsn, uint32_t max_cmdsn)
@@ -765,7 +765,7 @@ __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
			goto free_task;

	} else {

		list_add_tail(&task->running, &conn->mgmtqueue);

		iscsi_conn_queue_work(conn);

		iscsi_conn_queue_xmit(conn);

	}



	return task;
@@ -1513,7 +1513,7 @@ void iscsi_requeue_task(struct iscsi_task *task) 
		 */

		iscsi_put_task(task);

	}

	iscsi_conn_queue_work(conn);

	iscsi_conn_queue_xmit(conn);

	spin_unlock_bh(&conn->session->frwd_lock);

}

EXPORT_SYMBOL_GPL(iscsi_requeue_task);
@@ -1786,7 +1786,7 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc) 
		}

	} else {

		list_add_tail(&task->running, &conn->cmdqueue);

		iscsi_conn_queue_work(conn);

		iscsi_conn_queue_xmit(conn);

	}



	session->queued_cmdsn++;
@@ -1967,7 +1967,7 @@ EXPORT_SYMBOL_GPL(iscsi_suspend_tx); 
static void iscsi_start_tx(struct iscsi_conn *conn)

{

	clear_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);

	iscsi_conn_queue_work(conn);

	iscsi_conn_queue_xmit(conn);

}



/*

include/scsi/libiscsi.h

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ extern int iscsi_conn_get_addr_param(struct sockaddr_storage *addr, 
				     enum iscsi_param param, char *buf);

extern void iscsi_suspend_tx(struct iscsi_conn *conn);

extern void iscsi_suspend_queue(struct iscsi_conn *conn);

extern void iscsi_conn_queue_work(struct iscsi_conn *conn);

extern void iscsi_conn_queue_xmit(struct iscsi_conn *conn);



#define iscsi_conn_printk(prefix, _c, fmt, a...) \

	iscsi_cls_conn_printk(prefix, ((struct iscsi_conn *)_c)->cls_conn, \