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

Commit 5a330e39 authored by Kiyoshi Ueda's avatar Kiyoshi Ueda Committed by Jens Axboe
Browse files

blk_end_request: changing ide-scsi (take 4) 



This patch converts ide-scsi to use blk_end_request interfaces.
Related 'uptodate' arguments are converted to 'error'.

Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
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 avatarJens Axboe <jens.axboe@oracle.com>
parent 4c4e2148

drivers/scsi/ide-scsi.c

+4 −4
Original line number Diff line number Diff line
@@ -919,8 +919,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd) 
	}



	/* kill current request */

	blkdev_dequeue_request(req);

	end_that_request_last(req, 0);

	if (__blk_end_request(req, -EIO, 0))

		BUG();

	if (blk_sense_request(req))

		kfree(scsi->pc->buffer);

	kfree(scsi->pc);
@@ -929,8 +929,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd) 


	/* now nuke the drive queue */

	while ((req = elv_next_request(drive->queue))) {

		blkdev_dequeue_request(req);

		end_that_request_last(req, 0);

		if (__blk_end_request(req, -EIO, 0))

			BUG();

	}



	HWGROUP(drive)->rq = NULL;