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

Commit f974b196 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: pass number of bytes to complete to ide_complete_rq() 



There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent a9587fd8

drivers/ide/ide-atapi.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) 


		if (blk_special_request(rq)) {

			rq->errors = 0;

			ide_complete_rq(drive, 0);

			ide_complete_rq(drive, 0, blk_rq_bytes(rq));

		} else {

			if (blk_fs_request(rq) == 0 && uptodate <= 0) {

				if (rq->errors == 0)

drivers/ide/ide-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ ide_startstop_t ide_error(ide_drive_t *drive, const char *msg, u8 stat) 
			return ide_stopped;

		}

		rq->errors = err;

		ide_complete_rq(drive, err ? -EIO : 0);

		ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq));

		return ide_stopped;

	}

drivers/ide/ide-floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, 


		if (blk_special_request(rq)) {

			rq->errors = 0;

			ide_complete_rq(drive, 0);

			ide_complete_rq(drive, 0, blk_rq_bytes(rq));

			return ide_stopped;

		} else

			goto out_end;

drivers/ide/ide-io.c

+4 −4
Original line number Diff line number Diff line
@@ -141,13 +141,13 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err) 
		kfree(cmd);

}



int ide_complete_rq(ide_drive_t *drive, int error)

int ide_complete_rq(ide_drive_t *drive, int error, unsigned int nr_bytes)

{

	ide_hwif_t *hwif = drive->hwif;

	struct request *rq = hwif->rq;

	int rc;



	rc = blk_end_request(rq, error, blk_rq_bytes(rq));

	rc = blk_end_request(rq, error, nr_bytes);

	if (rc == 0)

		hwif->rq = NULL;
@@ -164,7 +164,7 @@ void ide_kill_rq(ide_drive_t *drive, struct request *rq) 


	if ((media == ide_floppy || media == ide_tape) && drv_req) {

		rq->errors = 0;

		ide_complete_rq(drive, 0);

		ide_complete_rq(drive, 0, blk_rq_bytes(rq));

	} else {

		if (media == ide_tape)

			rq->errors = IDE_DRV_ERROR_GENERAL;
@@ -312,7 +312,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive, 
 	printk("%s: DRIVE_CMD (null)\n", drive->name);

#endif

	rq->errors = 0;

	ide_complete_rq(drive, 0);

	ide_complete_rq(drive, 0, blk_rq_bytes(rq));



 	return ide_stopped;

}

drivers/ide/ide-tape.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, 
					"Two DSC requests were queued\n");

			drive->failed_pc = NULL;

			rq->errors = 0;

			ide_complete_rq(drive, 0);

			ide_complete_rq(drive, 0, blk_rq_bytes(rq));

			return ide_stopped;

		}