Skip to content

L
linux
Commit 8159b141 authored by James Bottomley's avatar James Bottomley
Browse files
Options

Merge by hand: recover axboe scsi_init_io() changes

parent 41c8a0e4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
drivers/scsi/scsi_lib.c
View file @ 8159b141
...@@ -789,6 +789,8 @@ static int scsi_init_io(Scsi_Cmnd *SCpnt) ...@@ -789,6 +789,8 @@ static int scsi_init_io(Scsi_Cmnd *SCpnt)
SCpnt->request_buffer = (char *) sgpnt; SCpnt->request_buffer = (char *) sgpnt;
SCpnt->request_bufflen = req->nr_sectors << 9; SCpnt->request_bufflen = req->nr_sectors << 9;
if (blk_pc_request(req))
SCpnt->request_bufflen = req->data_len;
req->buffer = NULL; req->buffer = NULL;
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7