Commit c93f87c7 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] iscsi_tcp: replace scsi_debug/tcp_debug logging with iscsi conn logging 



This makes the logging a compile time option and replaces
the tcp_debug macro with a iscsi connection one that prints
out a driver model id prefix.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 0ab1c252

drivers/scsi/iscsi_tcp.c

+34 −23
Original line number Diff line number Diff line
@@ -48,13 +48,6 @@ MODULE_AUTHOR("Mike Christie <michaelc@cs.wisc.edu>, " 
	      "Alex Aizman <itn780@yahoo.com>");

MODULE_DESCRIPTION("iSCSI/TCP data-path");

MODULE_LICENSE("GPL");

#undef DEBUG_TCP



#ifdef DEBUG_TCP

#define debug_tcp(fmt...) printk(KERN_INFO "tcp: " fmt)

#else

#define debug_tcp(fmt...)

#endif



static struct scsi_transport_template *iscsi_sw_tcp_scsi_transport;

static struct scsi_host_template iscsi_sw_tcp_sht;
@@ -63,6 +56,21 @@ static struct iscsi_transport iscsi_sw_tcp_transport; 
static unsigned int iscsi_max_lun = 512;

module_param_named(max_lun, iscsi_max_lun, uint, S_IRUGO);



static int iscsi_sw_tcp_dbg;

module_param_named(debug_iscsi_tcp, iscsi_sw_tcp_dbg, int,

		   S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(debug_iscsi_tcp, "Turn on debugging for iscsi_tcp module "

		 "Set to 1 to turn on, and zero to turn off. Default is off.");



#define ISCSI_SW_TCP_DBG(_conn, dbg_fmt, arg...)		\

	do {							\

		if (iscsi_sw_tcp_dbg)				\

			iscsi_conn_printk(KERN_INFO, _conn,	\

					     "%s " dbg_fmt,	\

					     __func__, ##arg);	\

	} while (0);





/**

 * iscsi_sw_tcp_recv - TCP receive in sendfile fashion

 * @rd_desc: read descriptor
@@ -77,7 +85,7 @@ static int iscsi_sw_tcp_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, 
	unsigned int consumed, total_consumed = 0;

	int status;



	debug_tcp("in %d bytes\n", skb->len - offset);

	ISCSI_SW_TCP_DBG(conn, "in %d bytes\n", skb->len - offset);



	do {

		status = 0;
@@ -86,7 +94,8 @@ static int iscsi_sw_tcp_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, 
		total_consumed += consumed;

	} while (consumed != 0 && status != ISCSI_TCP_SKB_DONE);



	debug_tcp("read %d bytes status %d\n", skb->len - offset, status);

	ISCSI_SW_TCP_DBG(conn, "read %d bytes status %d\n",

			 skb->len - offset, status);

	return total_consumed;

}
@@ -131,7 +140,8 @@ static void iscsi_sw_tcp_state_change(struct sock *sk) 
	if ((sk->sk_state == TCP_CLOSE_WAIT ||

	     sk->sk_state == TCP_CLOSE) &&

	    !atomic_read(&sk->sk_rmem_alloc)) {

		debug_tcp("iscsi_tcp_state_change: TCP_CLOSE|TCP_CLOSE_WAIT\n");

		ISCSI_SW_TCP_DBG(conn, "iscsi_tcp_state_change: "

				 "TCP_CLOSE|TCP_CLOSE_WAIT\n");

		iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);

	}
@@ -155,7 +165,7 @@ static void iscsi_sw_tcp_write_space(struct sock *sk) 
	struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data;



	tcp_sw_conn->old_write_space(sk);

	debug_tcp("iscsi_write_space: cid %d\n", conn->id);

	ISCSI_SW_TCP_DBG(conn, "iscsi_write_space\n");

	scsi_queue_work(conn->session->host, &conn->xmitwork);

}
@@ -283,7 +293,7 @@ static int iscsi_sw_tcp_xmit(struct iscsi_conn *conn) 
		}

	}



	debug_tcp("xmit %d bytes\n", consumed);

	ISCSI_SW_TCP_DBG(conn, "xmit %d bytes\n", consumed);



	conn->txdata_octets += consumed;

	return consumed;
@@ -291,7 +301,7 @@ static int iscsi_sw_tcp_xmit(struct iscsi_conn *conn) 
error:

	/* Transmit error. We could initiate error recovery

	 * here. */

	debug_tcp("Error sending PDU, errno=%d\n", rc);

	ISCSI_SW_TCP_DBG(conn, "Error sending PDU, errno=%d\n", rc);

	iscsi_conn_failure(conn, rc);

	return -EIO;

}
@@ -334,7 +344,8 @@ static int iscsi_sw_tcp_send_hdr_done(struct iscsi_tcp_conn *tcp_conn, 
	struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data;



	tcp_sw_conn->out.segment = tcp_sw_conn->out.data_segment;

	debug_tcp("Header done. Next segment size %u total_size %u\n",

	ISCSI_SW_TCP_DBG(tcp_conn->iscsi_conn,

			 "Header done. Next segment size %u total_size %u\n",

			 tcp_sw_conn->out.segment.size,

			 tcp_sw_conn->out.segment.total_size);

	return 0;
@@ -346,8 +357,8 @@ static void iscsi_sw_tcp_send_hdr_prep(struct iscsi_conn *conn, void *hdr, 
	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;

	struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data;



	debug_tcp("%s(%p%s)\n", __func__, tcp_conn,

			conn->hdrdgst_en? ", digest enabled" : "");

	ISCSI_SW_TCP_DBG(conn, "%s\n", conn->hdrdgst_en ?

			 "digest enabled" : "digest disabled");



	/* Clear the data segment - needs to be filled in by the

	 * caller using iscsi_tcp_send_data_prep() */
@@ -389,9 +400,9 @@ iscsi_sw_tcp_send_data_prep(struct iscsi_conn *conn, struct scatterlist *sg, 
	struct hash_desc *tx_hash = NULL;

	unsigned int hdr_spec_len;



	debug_tcp("%s(%p, offset=%d, datalen=%d%s)\n", __func__,

			tcp_conn, offset, len,

			conn->datadgst_en? ", digest enabled" : "");

	ISCSI_SW_TCP_DBG(conn, "offset=%d, datalen=%d %s\n", offset, len,

			 conn->datadgst_en ?

			 "digest enabled" : "digest disabled");



	/* Make sure the datalen matches what the caller

	   said he would send. */
@@ -415,8 +426,8 @@ iscsi_sw_tcp_send_linear_data_prep(struct iscsi_conn *conn, void *data, 
	struct hash_desc *tx_hash = NULL;

	unsigned int hdr_spec_len;



	debug_tcp("%s(%p, datalen=%d%s)\n", __func__, tcp_conn, len,

		  conn->datadgst_en? ", digest enabled" : "");

	ISCSI_SW_TCP_DBG(conn, "datalen=%zd %s\n", len, conn->datadgst_en ?

			 "digest enabled" : "digest disabled");



	/* Make sure the datalen matches what the caller

	   said he would send. */