This patch converts floppy to use blk_end_request(). Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx> Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx> --- drivers/block/floppy.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff -rupN 06-dac960-caller-change/drivers/block/floppy.c 07-floppy-caller-change/drivers/block/floppy.c --- 06-dac960-caller-change/drivers/block/floppy.c 2007-09-10 17:32:11.000000000 -0400 +++ 07-floppy-caller-change/drivers/block/floppy.c 2007-09-10 18:01:23.000000000 -0400 @@ -2290,18 +2290,16 @@ static int do_format(int drive, struct f static void floppy_end_request(struct request *req, int uptodate) { unsigned int nr_sectors = current_count_sectors; + unsigned int drive = (unsigned int)req->rq_disk->private_data; /* current_count_sectors can be zero if transfer failed */ if (!uptodate) nr_sectors = req->current_nr_sectors; - if (end_that_request_first(req, uptodate, nr_sectors)) + if (__blk_end_request(req, uptodate, nr_sectors << 9)) return; - add_disk_randomness(req->rq_disk); - floppy_off((long)req->rq_disk->private_data); - blkdev_dequeue_request(req); - end_that_request_last(req, uptodate); /* We're done with the request */ + floppy_off(drive); current_req = NULL; } -- dm-devel mailing list dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel