block: kill queue_sync_plugs()
authorJens Axboe <jaxboe@fusionio.com>
Tue, 12 Apr 2011 08:30:53 +0000 (10:30 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 12 Apr 2011 08:30:53 +0000 (10:30 +0200)
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>
block/blk-core.c

index 52e756c526be738501967970808a58cf71f4a819..c6eaa1f5646656452355ee86ef8396e608584ad0 100644 (file)
@@ -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);