aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 52e756c526be..c6eaa1f56466 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)
198} 198}
199EXPORT_SYMBOL(blk_dump_rq_flags); 199EXPORT_SYMBOL(blk_dump_rq_flags);
200 200
201/*
202 * Make sure that plugs that were pending when this function was entered,
203 * are now complete and requests pushed to the queue.
204*/
205static inline void queue_sync_plugs(struct request_queue *q)
206{
207 /*
208 * If the current process is plugged and has barriers submitted,
209 * we will livelock if we don't unplug first.
210 */
211 blk_flush_plug(current);
212}
213
214static void blk_delay_work(struct work_struct *work) 201static void blk_delay_work(struct work_struct *work)
215{ 202{
216 struct request_queue *q; 203 struct request_queue *q;
@@ -298,7 +285,6 @@ void blk_sync_queue(struct request_queue *q)
298{ 285{
299 del_timer_sync(&q->timeout); 286 del_timer_sync(&q->timeout);
300 cancel_delayed_work_sync(&q->delay_work); 287 cancel_delayed_work_sync(&q->delay_work);
301 queue_sync_plugs(q);
302} 288}
303EXPORT_SYMBOL(blk_sync_queue); 289EXPORT_SYMBOL(blk_sync_queue);
304 290