* [PATCH 07/28] blk_end_request: changing floppy (take 3)
@ 2007-11-30 23:27 Kiyoshi Ueda
0 siblings, 0 replies; only message in thread
From: Kiyoshi Ueda @ 2007-11-30 23:27 UTC (permalink / raw)
To: jens.axboe, bharrosh
Cc: linux-kernel, linux-scsi, linux-ide, dm-devel, j-nomura, k-ueda
This patch converts floppy to use blk_end_request().
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
---
drivers/block/floppy.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
Index: 2.6.24-rc3-mm2/drivers/block/floppy.c
===================================================================
--- 2.6.24-rc3-mm2.orig/drivers/block/floppy.c
+++ 2.6.24-rc3-mm2/drivers/block/floppy.c
@@ -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;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-11-30 23:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-30 23:27 [PATCH 07/28] blk_end_request: changing floppy (take 3) Kiyoshi Ueda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).