Skip to content

L
linux
Commit ca855a5e authored by James Bottomley's avatar James Bottomley
Browse files
Options

Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes

parents 0e1bfea9 e7661a8e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/scsi/scsi_lib.c
View file @ ca855a5e
...@@ -1061,10 +1061,10 @@ int scsi_init_io(struct scsi_cmnd *cmd) ...@@ -1061,10 +1061,10 @@ int scsi_init_io(struct scsi_cmnd *cmd)
struct scsi_device *sdev = cmd->device; struct scsi_device *sdev = cmd->device;
struct request *rq = cmd->request; struct request *rq = cmd->request;
bool is_mq = (rq->mq_ctx != NULL); bool is_mq = (rq->mq_ctx != NULL);
int error; int error = BLKPREP_KILL;
if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq))) if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
return -EINVAL; goto err_exit;
error = scsi_init_sgtable(rq, &cmd->sdb); error = scsi_init_sgtable(rq, &cmd->sdb);
if (error) if (error)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7