lkml.org 
[lkml]   [2005]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH 2.6.11-rc3 01/11] ide: task_end_request() fix
    From
    Date

    01_ide_task_end_request_fix.patch

    task_end_request() modified to always call ide_end_drive_cmd()
    for taskfile requests. Previously, ide_end_drive_cmd() was
    called only when task->tf_out_flags.all was set. Also,
    ide_dma_intr() is modified to use task_end_request().

    * fixes taskfile ioctl oops bug which was caused by referencing
    NULL rq->rq_disk of taskfile requests.
    * enables TASKFILE ioctls to get valid register outputs on
    successful completion.

    Signed-off-by: Tejun Heo <htejun@gmail.com>

    drivers/ide/ide-dma.c | 5 +----
    drivers/ide/ide-taskfile.c | 12 ++++--------
    include/linux/ide.h | 1 +
    3 files changed, 6 insertions(+), 12 deletions(-)

    Index: linux-ide/drivers/ide/ide-dma.c
    ===================================================================
    --- linux-ide.orig/drivers/ide/ide-dma.c 2005-02-10 17:31:48.917654643 +0900
    +++ linux-ide/drivers/ide/ide-dma.c 2005-02-10 17:38:00.033092056 +0900
    @@ -175,10 +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;
    - ide_driver_t *drv;
    -
    - drv = *(ide_driver_t **)rq->rq_disk->private_data;;
    - drv->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/drivers/ide/ide-taskfile.c
    ===================================================================
    --- linux-ide.orig/drivers/ide/ide-taskfile.c 2005-02-10 17:31:48.917654643 +0900
    +++ linux-ide/drivers/ide/ide-taskfile.c 2005-02-10 17:38:00.042090547 +0900
    @@ -364,18 +364,14 @@ 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)
    {
    ide_driver_t *drv;

    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;
    - }
    + u8 err = drive->hwif->INB(IDE_ERROR_REG);
    + ide_end_drive_cmd(drive, stat, err);
    + return;
    }

    drv = *(ide_driver_t **)rq->rq_disk->private_data;
    Index: linux-ide/include/linux/ide.h
    ===================================================================
    --- linux-ide.orig/include/linux/ide.h 2005-02-10 17:31:48.917654643 +0900
    +++ linux-ide/include/linux/ide.h 2005-02-10 17:38:00.044090212 +0900
    @@ -1290,6 +1290,7 @@ extern ide_startstop_t do_rw_taskfile(id
    */
    extern ide_startstop_t flagged_taskfile(ide_drive_t *, ide_task_t *);

    +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 *);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:10    [W:3.446 / U:1.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site