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

Commit 5b6c942d authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-floppy: do not complete rq's prematurely 



... and access them afterwards. Simplify rq completing code while at it.

Spotted-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d80c592c

drivers/ide/ide-atapi.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -310,16 +310,14 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) 
			pc->xferred = pc->req_xfer;

			pc->xferred = pc->req_xfer;

			if (drive->pc_update_buffers)

			if (drive->pc_update_buffers)

				drive->pc_update_buffers(drive, pc);

				drive->pc_update_buffers(drive, pc);



			if (drive->media == ide_floppy)

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

		}

		}

		debug_log("%s: DMA finished\n", drive->name);

		debug_log("%s: DMA finished\n", drive->name);

	}

	}





	/* No more interrupts */

	/* No more interrupts */

	if ((stat & ATA_DRQ) == 0) {

	if ((stat & ATA_DRQ) == 0) {

		int uptodate;

		int uptodate, error;

		unsigned int done;





		debug_log("Packet command completed, %d bytes transferred\n",

		debug_log("Packet command completed, %d bytes transferred\n",

			  pc->xferred);

			  pc->xferred);
@@ -366,9 +364,9 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) 




		if (blk_special_request(rq)) {

		if (blk_special_request(rq)) {

			rq->errors = 0;

			rq->errors = 0;

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

			done = blk_rq_bytes(rq);

			error = 0;

		} else {

		} else {

			unsigned int done;





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

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

				if (rq->errors == 0)

				if (rq->errors == 0)
@@ -380,9 +378,10 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) 
			else

			else

				done = blk_rq_bytes(rq);

				done = blk_rq_bytes(rq);





			ide_complete_rq(drive, uptodate ? 0 : -EIO, done);

			error = uptodate ? 0 : -EIO;

		}

		}





		ide_complete_rq(drive, error, done);

		return ide_stopped;

		return ide_stopped;

	}

	}