diff mbox series

[02/12] scsi: iscsi: Rename iscsi_conn_queue_work

Message ID 20220308002747.122682-3-michael.christie@oracle.com
State Superseded
Headers show
Series misc iscsi patches | expand

Commit Message

Mike Christie March 8, 2022, 12:27 a.m. UTC 
Rename iscsi_conn_queue_work to iscsi_conn_queue_xmit to reflect it
handles queueing of xmits only.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
 drivers/scsi/cxgbi/libcxgbi.c |  2 +-
 drivers/scsi/iscsi_tcp.c      |  2 +-
 drivers/scsi/libiscsi.c       | 12 ++++++------
 include/scsi/libiscsi.h       |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

Comments

Wu Bo March 9, 2022, 12:55 a.m. UTC | #1 
On 2022/3/8 8:27, Mike Christie wrote:
> Rename iscsi_conn_queue_work to iscsi_conn_queue_xmit to reflect it
> handles queueing of xmits only.
> 
> Signed-off-by: Mike Christie <michael.christie@oracle.com>
> ---
>   drivers/scsi/cxgbi/libcxgbi.c |  2 +-
>   drivers/scsi/iscsi_tcp.c      |  2 +-
>   drivers/scsi/libiscsi.c       | 12 ++++++------
>   include/scsi/libiscsi.h       |  2 +-
>   4 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
> index 4365d52c6430..411b0d386fad 100644
> --- a/drivers/scsi/cxgbi/libcxgbi.c
> +++ b/drivers/scsi/cxgbi/libcxgbi.c
> @@ -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);
> diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
> index 1bc37593c88f..f274a86d2ec0 100644
> --- a/drivers/scsi/iscsi_tcp.c
> +++ b/drivers/scsi/iscsi_tcp.c
> @@ -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)
> diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
> index 14f5737429cf..fa44445dc75f 100644
> --- a/drivers/scsi/libiscsi.c
> +++ b/drivers/scsi/libiscsi.c
> @@ -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)
> @@ -764,7 +764,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;
> @@ -1512,7 +1512,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);
> @@ -1781,7 +1781,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++;
> @@ -1962,7 +1962,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);
>   }
>   
>   /*
> diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
> index 10a9b89b7448..b567ea4700e5 100644
> --- a/include/scsi/libiscsi.h
> +++ b/include/scsi/libiscsi.h
> @@ -441,7 +441,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, \
> 

Reviewed-by: Wu Bo <wubo40@huawei.com>

.
diff mbox series

Patch

diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index 4365d52c6430..411b0d386fad 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -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);
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 1bc37593c88f..f274a86d2ec0 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -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)
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 14f5737429cf..fa44445dc75f 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -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)
@@ -764,7 +764,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;
@@ -1512,7 +1512,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);
@@ -1781,7 +1781,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++;
@@ -1962,7 +1962,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);
 }
 
 /*
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 10a9b89b7448..b567ea4700e5 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -441,7 +441,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, \