mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst_copy_mgr: Avoid that device deletion sporadically causes a hang (merge r8515 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@8516 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-08-21 21:35:19 +00:00
parent 1d668e87a0
commit ff9867252b
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scst/src/scst_copy_mgr.c
View File

@@ -2342,17 +2342,24 @@ static void scst_cm_init_inq_finish(struct scst_cmd *cmd)
/* cmd->dev can be NULL here! */
rc = scst_cm_err_check_retry(cmd, cmd->start_time, scst_cm_inq_retry_fn);
if (rc == SCST_CM_STATUS_RETRY || !cmd->dev || !cmd->tgt_dev)
if (rc == SCST_CM_STATUS_RETRY)
goto out;
/*
* Since scst_cm_inq_retry_fn() uses cmd->tgt_i_priv, only free that
* pointer once it is clear that that function won't be called.
*/
kfree(priv);
priv = NULL;
cmd->tgt_i_priv = NULL;
if (WARN_ON_ONCE(!dev))
goto out;
spin_lock_bh(&dev->dev_lock);
scst_unblock_dev(dev);
spin_unlock_bh(&dev->dev_lock);
kfree(priv);
priv = NULL;
cmd->tgt_i_priv = NULL;
if (rc != SCST_CM_STATUS_CMD_SUCCEEDED) {
PRINT_CRIT_ERROR("Unable to perform initial INQUIRY for device "
"%s. Copy manager for this device will be disabled",
@@ -2449,13 +2456,16 @@ out:
static int scst_cm_send_init_inquiry(struct scst_device *dev,
unsigned int unpacked_lun, struct scst_cm_init_inq_priv *priv)
{
int res;
int res = -EINVAL;
static const uint8_t inq_cdb[6] = { INQUIRY, 1, 0x83, 0x10, 0, 0 };
__be64 lun;
struct scst_cmd *cmd;
TRACE_ENTRY();
if (WARN_ON_ONCE(!dev))
goto out;
if (priv == NULL) {
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (priv == NULL) {