summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-04-12 10:30:53 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-04-12 10:30:53 +0200
commitcf82c798394cd443eed7d91f998b79a63f341e91 (patch)
tree7ec33967528f4106dbbe32dad5e823c2c299b0a5 /block
parentdc6d36c9710d1fed42d1bbe7d8e4f742abd844c6 (diff)
downloadlinux-3.10-cf82c798394cd443eed7d91f998b79a63f341e91.tar.gz
linux-3.10-cf82c798394cd443eed7d91f998b79a63f341e91.tar.bz2
linux-3.10-cf82c798394cd443eed7d91f998b79a63f341e91.zip
block: kill queue_sync_plugs()
The original use for this dates back to when we had to track write requests for serializing around barriers. That's not needed anymore, so kill it. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 52e756c526b..c6eaa1f5646 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -198,19 +198,6 @@ void blk_dump_rq_flags(struct request *rq, char *msg)
}
EXPORT_SYMBOL(blk_dump_rq_flags);
-/*
- * Make sure that plugs that were pending when this function was entered,
- * are now complete and requests pushed to the queue.
-*/
-static inline void queue_sync_plugs(struct request_queue *q)
-{
- /*
- * If the current process is plugged and has barriers submitted,
- * we will livelock if we don't unplug first.
- */
- blk_flush_plug(current);
-}
-
static void blk_delay_work(struct work_struct *work)
{
struct request_queue *q;
@@ -298,7 +285,6 @@ void blk_sync_queue(struct request_queue *q)
{
del_timer_sync(&q->timeout);
cancel_delayed_work_sync(&q->delay_work);
- queue_sync_plugs(q);
}
EXPORT_SYMBOL(blk_sync_queue);