|
@@ -852,7 +852,7 @@ static void scsi_end_bidi_request(struct scsi_cmnd *cmd)
|
|
void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
|
|
void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
|
|
{
|
|
{
|
|
int result = cmd->result;
|
|
int result = cmd->result;
|
|
- int this_count = scsi_bufflen(cmd);
|
|
|
|
|
|
+ int this_count;
|
|
struct request_queue *q = cmd->device->request_queue;
|
|
struct request_queue *q = cmd->device->request_queue;
|
|
struct request *req = cmd->request;
|
|
struct request *req = cmd->request;
|
|
int error = 0;
|
|
int error = 0;
|
|
@@ -908,6 +908,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
|
|
*/
|
|
*/
|
|
if (scsi_end_request(cmd, error, good_bytes, result == 0) == NULL)
|
|
if (scsi_end_request(cmd, error, good_bytes, result == 0) == NULL)
|
|
return;
|
|
return;
|
|
|
|
+ this_count = blk_rq_bytes(req);
|
|
|
|
|
|
/* good_bytes = 0, or (inclusive) there were leftovers and
|
|
/* good_bytes = 0, or (inclusive) there were leftovers and
|
|
* result = 0, so scsi_end_request couldn't retry.
|
|
* result = 0, so scsi_end_request couldn't retry.
|