mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
ub: Fix timeouts
The wodim says: "close track/session scsi sendcmd: cmd timeout after 5.000 (480) s" This happened because we ignored the supplied timeout and used 5s. It's not completely correct to apply a timeout meant for the complete command to any single URB, but we don't have many URBs per command, so this is simple and works. Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
043042109b
commit
2c51ae70ed
1 changed files with 15 additions and 2 deletions
|
@ -205,6 +205,7 @@ struct ub_scsi_cmd {
|
|||
unsigned char key, asc, ascq; /* May be valid if error==-EIO */
|
||||
|
||||
int stat_count; /* Retries getting status. */
|
||||
unsigned int timeo; /* jiffies until rq->timeout changes */
|
||||
|
||||
unsigned int len; /* Requested length */
|
||||
unsigned int current_sg;
|
||||
|
@ -764,6 +765,12 @@ static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun,
|
|||
cmd->cdb_len = rq->cmd_len;
|
||||
|
||||
cmd->len = rq->data_len;
|
||||
|
||||
/*
|
||||
* To reapply this to every URB is not as incorrect as it looks.
|
||||
* In return, we avoid any complicated tracking calculations.
|
||||
*/
|
||||
cmd->timeo = rq->timeout;
|
||||
}
|
||||
|
||||
static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
||||
|
@ -1336,7 +1343,10 @@ static void ub_data_start(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
return;
|
||||
}
|
||||
|
||||
sc->work_timer.expires = jiffies + UB_DATA_TIMEOUT;
|
||||
if (cmd->timeo)
|
||||
sc->work_timer.expires = jiffies + cmd->timeo;
|
||||
else
|
||||
sc->work_timer.expires = jiffies + UB_DATA_TIMEOUT;
|
||||
add_timer(&sc->work_timer);
|
||||
|
||||
cmd->state = UB_CMDST_DATA;
|
||||
|
@ -1376,7 +1386,10 @@ static int __ub_state_stat(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
|
|||
return -1;
|
||||
}
|
||||
|
||||
sc->work_timer.expires = jiffies + UB_STAT_TIMEOUT;
|
||||
if (cmd->timeo)
|
||||
sc->work_timer.expires = jiffies + cmd->timeo;
|
||||
else
|
||||
sc->work_timer.expires = jiffies + UB_STAT_TIMEOUT;
|
||||
add_timer(&sc->work_timer);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue