diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 02:52:07 -0500 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 02:52:07 -0500 |
commit | 7eaceaccab5f40bbfda044629a6298616aeaed50 (patch) | |
tree | 33954d12f63e25a47eb6d86ef3d3d0a5e62bf752 /drivers/block/loop.c | |
parent | 73c101011926c5832e6e141682180c4debe2cf45 (diff) |
block: remove per-queue plugging
Code has been converted over to the new explicit on-stack plugging,
and delay users have been converted to use the new API for that.
So lets kill off the old plugging along with aops->sync_page().
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/loop.c')
-rw-r--r-- | drivers/block/loop.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 49e6a545eb63..01b8e4a87c9f 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
@@ -541,17 +541,6 @@ out: | |||
541 | return 0; | 541 | return 0; |
542 | } | 542 | } |
543 | 543 | ||
544 | /* | ||
545 | * kick off io on the underlying address space | ||
546 | */ | ||
547 | static void loop_unplug(struct request_queue *q) | ||
548 | { | ||
549 | struct loop_device *lo = q->queuedata; | ||
550 | |||
551 | queue_flag_clear_unlocked(QUEUE_FLAG_PLUGGED, q); | ||
552 | blk_run_address_space(lo->lo_backing_file->f_mapping); | ||
553 | } | ||
554 | |||
555 | struct switch_request { | 544 | struct switch_request { |
556 | struct file *file; | 545 | struct file *file; |
557 | struct completion wait; | 546 | struct completion wait; |
@@ -918,7 +907,6 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, | |||
918 | */ | 907 | */ |
919 | blk_queue_make_request(lo->lo_queue, loop_make_request); | 908 | blk_queue_make_request(lo->lo_queue, loop_make_request); |
920 | lo->lo_queue->queuedata = lo; | 909 | lo->lo_queue->queuedata = lo; |
921 | lo->lo_queue->unplug_fn = loop_unplug; | ||
922 | 910 | ||
923 | if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync) | 911 | if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync) |
924 | blk_queue_flush(lo->lo_queue, REQ_FLUSH); | 912 | blk_queue_flush(lo->lo_queue, REQ_FLUSH); |
@@ -1020,7 +1008,6 @@ static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev) | |||
1020 | 1008 | ||
1021 | kthread_stop(lo->lo_thread); | 1009 | kthread_stop(lo->lo_thread); |
1022 | 1010 | ||
1023 | lo->lo_queue->unplug_fn = NULL; | ||
1024 | lo->lo_backing_file = NULL; | 1011 | lo->lo_backing_file = NULL; |
1025 | 1012 | ||
1026 | loop_release_xfer(lo); | 1013 | loop_release_xfer(lo); |