Unverified Commit e2e88669 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6803 scsi: target: core: Add TMF to tmr_list handling 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cui GaoSheng <cuigaosheng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NB3UYYUMEOJQZLNM5A3POYUROVTX77JY/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9HJQC 
 
Link:https://gitee.com/openeuler/kernel/pulls/6803

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 48d72040 96941c1c

drivers/target/target_core_device.c

+0 −5
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u64 unpacked_lun) 
	struct se_session *se_sess = se_cmd->se_sess;

	struct se_node_acl *nacl = se_sess->se_node_acl;

	struct se_tmr_req *se_tmr = se_cmd->se_tmr_req;

	unsigned long flags;



	rcu_read_lock();

	deve = target_nacl_find_deve(nacl, unpacked_lun);
@@ -195,10 +194,6 @@ int transport_lookup_tmr_lun(struct se_cmd *se_cmd, u64 unpacked_lun) 
	se_cmd->se_dev = rcu_dereference_raw(se_lun->lun_se_dev);

	se_tmr->tmr_dev = rcu_dereference_raw(se_lun->lun_se_dev);



	spin_lock_irqsave(&se_tmr->tmr_dev->se_tmr_lock, flags);

	list_add_tail(&se_tmr->tmr_list, &se_tmr->tmr_dev->dev_tmr_list);

	spin_unlock_irqrestore(&se_tmr->tmr_dev->se_tmr_lock, flags);



	return 0;

}

EXPORT_SYMBOL(transport_lookup_tmr_lun);

drivers/target/target_core_transport.c

+4 −0
Original line number Diff line number Diff line
@@ -3431,6 +3431,10 @@ int transport_generic_handle_tmr( 
	unsigned long flags;

	bool aborted = false;



	spin_lock_irqsave(&cmd->se_dev->se_tmr_lock, flags);

	list_add_tail(&cmd->se_tmr_req->tmr_list, &cmd->se_dev->dev_tmr_list);

	spin_unlock_irqrestore(&cmd->se_dev->se_tmr_lock, flags);



	spin_lock_irqsave(&cmd->t_state_lock, flags);

	if (cmd->transport_state & CMD_T_ABORTED) {

		aborted = true;