Commit b7819b92 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove the blk_execute_rq return value 



The function only returns -EIO if rq->errors is non-zero, which is not
very useful and lets a large number of callers ignore the return value.

Just let the callers figure out their error themselves.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarBart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 75a500ef

block/blk-exec.c

+1 −7
Original line number Diff line number Diff line
@@ -92,11 +92,10 @@ EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); 
 *    Insert a fully prepared request at the back of the I/O scheduler queue

 *    for execution and wait for completion.

 */

int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,

void blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,

		   struct request *rq, int at_head)

{

	DECLARE_COMPLETION_ONSTACK(wait);

	int err = 0;

	unsigned long hang_check;



	rq->end_io_data = &wait;
@@ -108,10 +107,5 @@ int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk, 
		while (!wait_for_completion_io_timeout(&wait, hang_check * (HZ/2)));

	else

		wait_for_completion_io(&wait);



	if (rq->errors)

		err = -EIO;



	return err;

}

EXPORT_SYMBOL(blk_execute_rq);

block/scsi_ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -547,7 +547,8 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, 
	scsi_req(rq)->cmd[0] = cmd;

	scsi_req(rq)->cmd[4] = data;

	scsi_req(rq)->cmd_len = 6;

	err = blk_execute_rq(q, bd_disk, rq, 0);

	blk_execute_rq(q, bd_disk, rq, 0);

	err = rq->errors ? -EIO : 0;

	blk_put_request(rq);



	return err;

drivers/block/virtio_blk.c

+2 −1
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) 
	if (err)

		goto out;



	err = blk_execute_rq(vblk->disk->queue, vblk->disk, req, false);

	blk_execute_rq(vblk->disk->queue, vblk->disk, req, false);

	err = req->errors ? -EIO : 0;

out:

	blk_put_request(req);

	return err;

drivers/cdrom/cdrom.c

+2 −1
Original line number Diff line number Diff line
@@ -2218,7 +2218,8 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf, 
		rq->timeout = 60 * HZ;

		bio = rq->bio;



		if (blk_execute_rq(q, cdi->disk, rq, 0)) {

		blk_execute_rq(q, cdi->disk, rq, 0);

		if (rq->errors) {

			struct request_sense *s = req->sense;

			ret = -EIO;

			cdi->last_sense = s->sense_key;

drivers/ide/ide-atapi.c

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, 
	memcpy(scsi_req(rq)->cmd, pc->c, 12);

	if (drive->media == ide_tape)

		scsi_req(rq)->cmd[13] = REQ_IDETAPE_PC1;

	error = blk_execute_rq(drive->queue, disk, rq, 0);

	blk_execute_rq(drive->queue, disk, rq, 0);

	error = rq->errors ? -EIO : 0;

put_req:

	blk_put_request(rq);

	return error;

CRA Git | Maintained and supported by SUSTech CRA and CCSE