aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/scsi_lib.c15
-rw-r--r--drivers/scsi/scsi_tgt_lib.c11
2 files changed, 6 insertions, 20 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index b0c59ae63a2f..aa17e718666e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1104,7 +1104,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
1104 * 1104 *
1105 * Returns: 0 on success 1105 * Returns: 0 on success
1106 * BLKPREP_DEFER if the failure is retryable 1106 * BLKPREP_DEFER if the failure is retryable
1107 * BLKPREP_KILL if the failure is fatal
1108 */ 1107 */
1109static int scsi_init_io(struct scsi_cmnd *cmd) 1108static int scsi_init_io(struct scsi_cmnd *cmd)
1110{ 1109{
@@ -1138,17 +1137,9 @@ static int scsi_init_io(struct scsi_cmnd *cmd)
1138 * each segment. 1137 * each segment.
1139 */ 1138 */
1140 count = blk_rq_map_sg(req->q, req, cmd->request_buffer); 1139 count = blk_rq_map_sg(req->q, req, cmd->request_buffer);
1141 if (likely(count <= cmd->use_sg)) { 1140 BUG_ON(count > cmd->use_sg);
1142 cmd->use_sg = count; 1141 cmd->use_sg = count;
1143 return BLKPREP_OK; 1142 return BLKPREP_OK;
1144 }
1145
1146 printk(KERN_ERR "Incorrect number of segments after building list\n");
1147 printk(KERN_ERR "counted %d, received %d\n", count, cmd->use_sg);
1148 printk(KERN_ERR "req nr_sec %lu, cur_nr_sec %u\n", req->nr_sectors,
1149 req->current_nr_sectors);
1150
1151 return BLKPREP_KILL;
1152} 1143}
1153 1144
1154static struct scsi_cmnd *scsi_get_cmd_from_req(struct scsi_device *sdev, 1145static struct scsi_cmnd *scsi_get_cmd_from_req(struct scsi_device *sdev,
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 241815e911e7..93ece8f4e5de 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -368,14 +368,9 @@ static int scsi_tgt_init_cmd(struct scsi_cmnd *cmd, gfp_t gfp_mask)
368 dprintk("cmd %p cnt %d %lu\n", cmd, scsi_sg_count(cmd), 368 dprintk("cmd %p cnt %d %lu\n", cmd, scsi_sg_count(cmd),
369 rq_data_dir(rq)); 369 rq_data_dir(rq));
370 count = blk_rq_map_sg(rq->q, rq, scsi_sglist(cmd)); 370 count = blk_rq_map_sg(rq->q, rq, scsi_sglist(cmd));
371 if (likely(count <= scsi_sg_count(cmd))) { 371 BUG_ON(count > cmd->use_sg);
372 cmd->use_sg = count; 372 cmd->use_sg = count;
373 return 0; 373 return 0;
374 }
375
376 eprintk("cmd %p cnt %d\n", cmd, scsi_sg_count(cmd));
377 scsi_free_sgtable(cmd);
378 return -EINVAL;
379} 374}
380 375
381/* TODO: test this crap and replace bio_map_user with new interface maybe */ 376/* TODO: test this crap and replace bio_map_user with new interface maybe */