Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
xcap
xcap-capability-linux
Commits
8e640118
Commit
8e640118
authored
Jun 15, 2005
by
James Bottomley
Browse files
update scsi_wait_req to new format for blk_rq_map_kern()
Signed-off-by:
James Bottomley
<
James.Bottomley@SteelEye.com
>
parent
e537a36d
Changes
1
Hide whitespace changes
Inline
Side-by-side
drivers/scsi/scsi_lib.c
View file @
8e640118
...
...
@@ -246,15 +246,18 @@ void scsi_wait_req(struct scsi_request *sreq, const void *cmnd, void *buffer,
unsigned
bufflen
,
int
timeout
,
int
retries
)
{
DECLARE_COMPLETION
(
wait
);
int
write
=
sreq
->
sr_data_direction
==
DMA_TO_DEVICE
;
struct
request
*
req
;
if
(
bufflen
)
req
=
blk_rq_map_kern
(
sreq
->
sr_device
->
request_queue
,
sreq
->
sr_data_direction
==
DMA_TO_DEVICE
,
buffer
,
bufflen
,
__GFP_WAIT
);
else
req
=
blk_get_request
(
sreq
->
sr_device
->
request_queue
,
READ
,
__GFP_WAIT
);
req
=
blk_get_request
(
sreq
->
sr_device
->
request_queue
,
write
,
__GFP_WAIT
);
if
(
bufflen
&&
blk_rq_map_kern
(
sreq
->
sr_device
->
request_queue
,
req
,
buffer
,
bufflen
,
__GFP_WAIT
))
{
sreq
->
sr_result
=
DRIVER_ERROR
<<
24
;
blk_put_request
(
req
);
return
;
}
req
->
flags
|=
REQ_NOMERGE
;
req
->
waiting
=
&
wait
;
req
->
end_io
=
scsi_wait_req_end_io
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment