Re: [PATCH 2.6.11-rc2 20/29] ide: task_end_request() fix

[Tejun Heo <tj@home-tj.org>]

> 20_ide_task_end_request_fix.patch
> 
> 	task_end_request() modified and made global.  ide_dma_intr()
> 	modified to use task_end_request().  These changes enable
> 	TASKFILE ioctls to get valid register outputs on successful
> 	completion.  No in-kernel usage should be affected.


Signed-off-by: Tejun Heo <tj@home-tj.org>


Index: linux-ide-export/drivers/ide/ide-dma.c
===================================================================
--- linux-ide-export.orig/drivers/ide/ide-dma.c	2005-02-02 10:28:05.642130143 +0900
+++ linux-ide-export/drivers/ide/ide-dma.c	2005-02-02 10:28:06.035066389 +0900
@@ -175,8 +175,7 @@ ide_startstop_t ide_dma_intr (ide_drive_
 	if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) {
 		if (!dma_stat) {
 			struct request *rq = HWGROUP(drive)->rq;
-
-			DRIVER(drive)->end_request(drive, 1, rq->nr_sectors);
+			task_end_request(drive, rq, stat);
 			return ide_stopped;
 		}
 		printk(KERN_ERR "%s: dma_intr: bad DMA status (dma_stat=%x)\n", 
Index: linux-ide-export/drivers/ide/ide-taskfile.c
===================================================================
--- linux-ide-export.orig/drivers/ide/ide-taskfile.c	2005-02-02 10:28:05.851096238 +0900
+++ linux-ide-export/drivers/ide/ide-taskfile.c	2005-02-02 10:28:06.035066389 +0900
@@ -366,18 +366,13 @@ static ide_startstop_t task_error(ide_dr
 	return ide_error(drive, s, stat);
 }
 
-static void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
+void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
 {
 	if (rq->flags & REQ_DRIVE_TASKFILE) {
-		ide_task_t *task = rq->special;
-
-		if (task->tf_out_flags.all) {
-			u8 err = drive->hwif->INB(IDE_ERROR_REG);
-			ide_end_drive_cmd(drive, stat, err);
-			return;
-		}
-	}
-	drive->driver->end_request(drive, 1, rq->hard_nr_sectors);
+		u8 err = drive->hwif->INB(IDE_ERROR_REG);
+		ide_end_drive_cmd(drive, stat, err);
+	} else
+		drive->driver->end_request(drive, 1, rq->hard_nr_sectors);
 }
 
 /*
Index: linux-ide-export/include/linux/ide.h
===================================================================
--- linux-ide-export.orig/include/linux/ide.h	2005-02-02 10:28:04.467320756 +0900
+++ linux-ide-export/include/linux/ide.h	2005-02-02 10:28:06.036066227 +0900
@@ -1318,6 +1318,7 @@ extern ide_startstop_t do_rw_taskfile(id
  */
 extern ide_startstop_t flagged_taskfile(ide_drive_t *, ide_task_t *);
 
+extern void task_end_request(ide_drive_t *, struct request *, u8);
 extern ide_startstop_t set_multmode_intr(ide_drive_t *);
 extern ide_startstop_t set_geometry_intr(ide_drive_t *);
 extern ide_startstop_t recal_intr(ide_drive_t *);