AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

scsi: clean up error handling in scsi_init_io

Browse Source 
There is no need to call scsi_mq_free_sgtables until we have actually
allocated sgtables.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-11-09 14:42:38 +01:00 committed by Jens Axboe
parent 785ba83b4f
commit 14784565f7
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/scsi/scsi_lib.c
View File

@ -1044,31 +1044,30 @@ int scsi_init_io(struct scsi_cmnd *cmd)
int error = BLKPREP_KILL; int error = BLKPREP_KILL;
if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq))) if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
goto err_exit; return BLKPREP_KILL;
error = scsi_init_sgtable(rq, &cmd->sdb); error = scsi_init_sgtable(rq, &cmd->sdb);
if (error) if (error)
goto err_exit; return error;
if (blk_bidi_rq(rq)) { if (blk_bidi_rq(rq)) {
error = scsi_init_sgtable(rq->next_rq, rq->next_rq->special); error = scsi_init_sgtable(rq->next_rq, rq->next_rq->special);
if (error) if (error)
goto err_exit; goto out_free_sgtables;
} }
if (blk_integrity_rq(rq)) { if (blk_integrity_rq(rq)) {
struct scsi_data_buffer *prot_sdb = cmd->prot_sdb; struct scsi_data_buffer *prot_sdb = cmd->prot_sdb;
int ivecs, count; int ivecs, count;
if (prot_sdb == NULL) { if (WARN_ON_ONCE(!prot_sdb)) {
/* /*
* This can happen if someone (e.g. multipath) * This can happen if someone (e.g. multipath)
* queues a command to a device on an adapter * queues a command to a device on an adapter
* that does not support DIX. * that does not support DIX.
*/ */
WARN_ON_ONCE(1);
error = BLKPREP_KILL; error = BLKPREP_KILL;
goto err_exit; goto out_free_sgtables;
} }
ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio); ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);
@ -1076,7 +1075,7 @@ int scsi_init_io(struct scsi_cmnd *cmd)
if (sg_alloc_table_chained(&prot_sdb->table, ivecs, if (sg_alloc_table_chained(&prot_sdb->table, ivecs,
prot_sdb->table.sgl)) { prot_sdb->table.sgl)) {
error = BLKPREP_DEFER; error = BLKPREP_DEFER;
goto err_exit; goto out_free_sgtables;
} }
count = blk_rq_map_integrity_sg(rq->q, rq->bio, count = blk_rq_map_integrity_sg(rq->q, rq->bio,
@ -1089,7 +1088,7 @@ int scsi_init_io(struct scsi_cmnd *cmd)
} }
return BLKPREP_OK; return BLKPREP_OK;
err_exit: out_free_sgtables:
scsi_mq_free_sgtables(cmd); scsi_mq_free_sgtables(cmd);
return error; return error;
} }