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

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

scsi: iscsi target: have iscsit_start_nopin_timer call __iscsit_start_nopin_timer 



Just have iscsit_start_nopin_timer grab the lock and call
__iscsit_start_nopin_timer.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6a64f6e1

drivers/target/iscsi/iscsi_target_util.c

+1 −19
Original line number Diff line number Diff line
@@ -1053,26 +1053,8 @@ void __iscsit_start_nopin_timer(struct iscsi_conn *conn) 


void iscsit_start_nopin_timer(struct iscsi_conn *conn)

{

	struct iscsi_session *sess = conn->sess;

	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);

	/*

	 * NOPIN timeout is disabled..

	 */

	if (!na->nopin_timeout)

		return;



	spin_lock_bh(&conn->nopin_timer_lock);

	if (conn->nopin_timer_flags & ISCSI_TF_RUNNING) {

		spin_unlock_bh(&conn->nopin_timer_lock);

		return;

	}



	conn->nopin_timer_flags &= ~ISCSI_TF_STOP;

	conn->nopin_timer_flags |= ISCSI_TF_RUNNING;

	mod_timer(&conn->nopin_timer, jiffies + na->nopin_timeout * HZ);



	pr_debug("Started NOPIN Timer on CID: %d at %u second"

			" interval\n", conn->cid, na->nopin_timeout);

	__iscsit_start_nopin_timer(conn);

	spin_unlock_bh(&conn->nopin_timer_lock);

}