diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-07-03 17:45:35 +0900 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 18:24:00 +0200 |
| commit | 7f9815f09dc201f2205981c11fadcf82a9e3cc42 (patch) | |
| tree | ffc8ca31584e269a87d0ebbcac16f8b5b1b763ff /drivers/block/osdblk.c | |
| parent | 90467c294aba7f911bdae72ed86995cf1de4d364 (diff) | |
| download | linux-3.10-7f9815f09dc201f2205981c11fadcf82a9e3cc42.tar.gz linux-3.10-7f9815f09dc201f2205981c11fadcf82a9e3cc42.tar.bz2 linux-3.10-7f9815f09dc201f2205981c11fadcf82a9e3cc42.zip | |
osdblk: stop using q->prepare_flush_fn
use REQ_FLUSH flag instead.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/osdblk.c')
| -rw-r--r-- | drivers/block/osdblk.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c index 819002ba343..9639565a9a6 100644 --- a/drivers/block/osdblk.c +++ b/drivers/block/osdblk.c @@ -323,7 +323,7 @@ static void osdblk_rq_fn(struct request_queue *q) * driver-specific, etc. */ - do_flush = (rq->special == (void *) 0xdeadbeefUL); + do_flush = rq->cmd_flags & REQ_FLUSH; do_write = (rq_data_dir(rq) == WRITE); if (!do_flush) { /* osd_flush does not use a bio */ @@ -380,14 +380,6 @@ static void osdblk_rq_fn(struct request_queue *q) } } -static void osdblk_prepare_flush(struct request_queue *q, struct request *rq) -{ - /* add driver-specific marker, to indicate that this request - * is a flush command - */ - rq->special = (void *) 0xdeadbeefUL; -} - static void osdblk_free_disk(struct osdblk_device *osdev) { struct gendisk *disk = osdev->disk; @@ -447,7 +439,7 @@ static int osdblk_init_disk(struct osdblk_device *osdev) blk_queue_stack_limits(q, osd_request_queue(osdev->osd)); blk_queue_prep_rq(q, blk_queue_start_tag); - blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH, osdblk_prepare_flush); + blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH, NULL); disk->queue = q; |