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

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

scsi: target: fix __transport_register_session locking 



When __transport_register_session is called from transport_register_session
irqs will already have been disabled, so we do not want the unlock irq call
to enable them until the higher level has done the final
spin_unlock_irqrestore/ spin_unlock_irq.

This has __transport_register_session use the save/restore call.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c8a75afb

drivers/target/target_core_transport.c

+3 −2
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ void __transport_register_session( 
{

	const struct target_core_fabric_ops *tfo = se_tpg->se_tpg_tfo;

	unsigned char buf[PR_REG_ISID_LEN];

	unsigned long flags;



	se_sess->se_tpg = se_tpg;

	se_sess->fabric_sess_ptr = fabric_sess_ptr;
@@ -383,7 +384,7 @@ void __transport_register_session( 
			se_sess->sess_bin_isid = get_unaligned_be64(&buf[0]);

		}



		spin_lock_irq(&se_nacl->nacl_sess_lock);

		spin_lock_irqsave(&se_nacl->nacl_sess_lock, flags);

		/*

		 * The se_nacl->nacl_sess pointer will be set to the

		 * last active I_T Nexus for each struct se_node_acl.
@@ -392,7 +393,7 @@ void __transport_register_session( 


		list_add_tail(&se_sess->sess_acl_list,

			      &se_nacl->acl_sess_list);

		spin_unlock_irq(&se_nacl->nacl_sess_lock);

		spin_unlock_irqrestore(&se_nacl->nacl_sess_lock, flags);

	}

	list_add_tail(&se_sess->sess_list, &se_tpg->tpg_sess_list);