Skip to contentSkip to conversation

iscsi update: rm conn lock

PATCH New Mike Christie 1 participant 1 message Feb 2, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 5/9 iscsi update: rm conn lock

Quoted 1 line

From [email protected]:

rm conn->lock since it is not used anymore. The dataqueue is protected by the session lock and xmitmutex.

drivers/scsi/iscsi_tcp.c +0 -4
index 323fd19..7965c46 100644
@@ -244,12 +244,10 @@ iscsi_ctask_cleanup(struct iscsi_conn *c
 	if (sc->sc_data_direction == DMA_TO_DEVICE) {
 		struct iscsi_data_task *dtask, *n;
 		/* WRITE: cleanup Data-Out's if any */
-		spin_lock(&conn->lock);
 		list_for_each_entry_safe(dtask, n, &ctask->dataqueue, item) {
 			list_del(&dtask->item);
 			mempool_free(dtask, ctask->datapool);
 		}
-		spin_unlock(&conn->lock);
 	}
 	ctask->xmstate = XMSTATE_IDLE;
 	ctask->r2t = NULL;
@@ -2453,8 +2451,6 @@ iscsi_conn_create(struct iscsi_cls_sessi
 	conn->data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
 	conn->max_recv_dlength = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;
 
-	spin_lock_init(&conn->lock);
-
 	/* initialize general xmit PDU commands queue */
 	conn->xmitqueue = kfifo_alloc(session->cmds_max * sizeof(void*),
 					GFP_KERNEL, NULL);
drivers/scsi/iscsi_tcp.h +0 -1
index 6766b81..ba26741 100644
@@ -146,7 +146,6 @@ struct iscsi_conn {
 	struct iscsi_mgmt_task	*login_mtask;	/* mtask used for login/text */
 	struct iscsi_mgmt_task	*mtask;		/* xmit mtask in progress */
 	struct iscsi_cmd_task	*ctask;		/* xmit ctask in progress */
-	spinlock_t		lock;		/* FIXME: to be removed */
 
 	/* old values for socket callbacks */
 	void			(*old_data_ready)(struct sock *, int);