diff options
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 9ff0ca9988a9..39b3acfc0ddf 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -787,9 +787,9 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) | |||
787 | * Next deal with any sectors which we were able to correctly | 787 | * Next deal with any sectors which we were able to correctly |
788 | * handle. | 788 | * handle. |
789 | */ | 789 | */ |
790 | SCSI_LOG_HLCOMPLETE(1, printk("%ld sectors total, " | 790 | SCSI_LOG_HLCOMPLETE(1, printk("%u sectors total, " |
791 | "%d bytes done.\n", | 791 | "%d bytes done.\n", |
792 | req->nr_sectors, good_bytes)); | 792 | blk_rq_sectors(req), good_bytes)); |
793 | 793 | ||
794 | /* | 794 | /* |
795 | * Recovered errors need reporting, but they're always treated | 795 | * Recovered errors need reporting, but they're always treated |
@@ -968,7 +968,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb, | |||
968 | if (blk_pc_request(req)) | 968 | if (blk_pc_request(req)) |
969 | sdb->length = req->data_len; | 969 | sdb->length = req->data_len; |
970 | else | 970 | else |
971 | sdb->length = req->nr_sectors << 9; | 971 | sdb->length = blk_rq_sectors(req) << 9; |
972 | return BLKPREP_OK; | 972 | return BLKPREP_OK; |
973 | } | 973 | } |
974 | 974 | ||