Skip to contentSkip to conversation

: resubmitted: Fix erroneous rq->buffer = NULL in ide-io.c:ide_dma_timeout_retry

PATCH Applied Prarit Bhargava 3 participants 3 messages Jan 6, 2005 – Jan 7, 2005 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : resubmitted: Fix erroneous rq->buffer = NULL in ide-io.c:ide_dma_timeout_retry

Colleagues,

Please see discussion related to this patch here,

http://marc.theaimsgroup.com/?l=linux-ide&m=110485007824374&w=2

Thanks,

Prarit.

drivers/ide/ide-io.c 2005-01-04 15:45:27.000000000 -0500 renamed from drivers/ide/ide-io.c 2005-01-04 15:45:17.000000000 -0500 +1 -1
@@ -1205,21 +1205,21 @@
       HWGROUP(drive)->rq = NULL;
 
       rq->errors = 0;
 
       if (!rq->bio)
               goto out;
 
       rq->sector = rq->bio->bi_sector;
       rq->current_nr_sectors = bio_iovec(rq->bio)->bv_len >> 9;
       rq->hard_cur_sectors = rq->current_nr_sectors;
-       rq->buffer = NULL;
+       rq->buffer = bio_data(rq->bio);

out:

       return ret;
}

/**
* ide_timer_expiry - handle lack of an IDE interrupt
* @data: timer callback magic (hwgroup)
*
* An IDE command has timed out before the expected drive return
* occurred. At this point we attempt to clean up the current

Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Prarit Bhargava

Colleagues,

Please see discussion related to this patch here,

http://marc.theaimsgroup.com/?l=linux-ide&m=110485007824374&w=2

Quoted 38 lines

Thanks,

Prarit.

drivers/ide/ide-io.c 2005-01-04 15:45:27.000000000 -0500 renamed from drivers/ide/ide-io.c 2005-01-04 15:45:17.000000000 -0500 +1 -1
@@ -1205,21 +1205,21 @@
       HWGROUP(drive)->rq = NULL;
 
       rq->errors = 0;
 
       if (!rq->bio)
               goto out;
 
       rq->sector = rq->bio->bi_sector;
       rq->current_nr_sectors = bio_iovec(rq->bio)->bv_len >> 9;
       rq->hard_cur_sectors = rq->current_nr_sectors;
-       rq->buffer = NULL;
+       rq->buffer = bio_data(rq->bio);

out:

       return ret;
}

/**
* ide_timer_expiry - handle lack of an IDE interrupt
* @data: timer callback magic (hwgroup)
*
* An IDE command has timed out before the expected drive return
* occurred. At this point we attempt to clean up the current

-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line
Jens Axboe