blktrace: Add blktrace ioctls to SCSI generic devices

[linux-2.6] / drivers / scsi / scsi_tgt_lib.c

diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 241815e911e7bacf41dc5c105aacf969a8d5c69b..93ece8f4e5dea391c07c8a4241df9d180489c869 100644 (file)
--- 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)
        dprintk("cmd %p cnt %d %lu\n", cmd, scsi_sg_count(cmd),
                rq_data_dir(rq));
        count = blk_rq_map_sg(rq->q, rq, scsi_sglist(cmd));
-       if (likely(count <= scsi_sg_count(cmd))) {
-               cmd->use_sg = count;
-               return 0;
-       }
-
-       eprintk("cmd %p cnt %d\n", cmd, scsi_sg_count(cmd));
-       scsi_free_sgtable(cmd);
-       return -EINVAL;
+       BUG_ON(count > cmd->use_sg);
+       cmd->use_sg = count;
+       return 0;
 }
 
 /* TODO: test this crap and replace bio_map_user with new interface maybe */