Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8de1631 authored by Kiyoshi Ueda's avatar Kiyoshi Ueda Committed by James Bottomley
Browse files

[SCSI] bidirectional: fix up for the new blk_end_request code 



Signed-off-by: default avatarKiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 6f9a35e2

drivers/scsi/scsi_lib.c

+10 −2
Original line number Diff line number Diff line
@@ -812,8 +812,16 @@ EXPORT_SYMBOL(scsi_release_buffers); 
 */

void scsi_end_bidi_request(struct scsi_cmnd *cmd)

{

	blk_end_bidi_request(cmd->request, 0, scsi_out(cmd)->resid,

							scsi_in(cmd)->resid);

	struct request *req = cmd->request;

	unsigned int dlen = req->data_len;

	unsigned int next_dlen = req->next_rq->data_len;



	req->data_len = scsi_out(cmd)->resid;

	req->next_rq->data_len = scsi_in(cmd)->resid;



	/* The req and req->next_rq have not been completed */

	BUG_ON(blk_end_bidi_request(req, 0, dlen, next_dlen));



	scsi_release_buffers(cmd);



	/*