evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: target: fix __transport_register_session locking

Browse source 
[ Upstream commit 6a64f6e1591322beb8ce16e952a53582caf2a15c ]

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: Mike Christie <mchristi@redhat.com>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mike Christie 2018-08-02 12:12:20 -05:00 • committed by Greg Kroah-Hartman
parent bf748acafd
commit 44dc4734a7
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/target/target_core_transport.c
View file

@ -306,6 +306,7 @@ void __transport_register_session(
{ {
const struct target_core_fabric_ops *tfo = se_tpg->se_tpg_tfo; const struct target_core_fabric_ops *tfo = se_tpg->se_tpg_tfo;
unsigned char buf[PR_REG_ISID_LEN]; unsigned char buf[PR_REG_ISID_LEN];
unsigned long flags;
se_sess->se_tpg = se_tpg; se_sess->se_tpg = se_tpg;
se_sess->fabric_sess_ptr = fabric_sess_ptr; se_sess->fabric_sess_ptr = fabric_sess_ptr;
@ -342,7 +343,7 @@ void __transport_register_session(
se_sess->sess_bin_isid = get_unaligned_be64(&buf[0]); 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 * The se_nacl->nacl_sess pointer will be set to the
* last active I_T Nexus for each struct se_node_acl. * last active I_T Nexus for each struct se_node_acl.
@ -351,7 +352,7 @@ void __transport_register_session(
list_add_tail(&se_sess->sess_acl_list, list_add_tail(&se_sess->sess_acl_list,
&se_nacl->acl_sess_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); list_add_tail(&se_sess->sess_list, &se_tpg->tpg_sess_list);