diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-04-12 04:30:53 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-04-12 04:30:53 -0400 |
| commit | cf82c798394cd443eed7d91f998b79a63f341e91 (patch) | |
| tree | 7ec33967528f4106dbbe32dad5e823c2c299b0a5 /block | |
| parent | dc6d36c9710d1fed42d1bbe7d8e4f742abd844c6 (diff) | |
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.c | 14 |
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 | } |
| 199 | EXPORT_SYMBOL(blk_dump_rq_flags); | 199 | EXPORT_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 | */ | ||
| 205 | static 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 | |||
| 214 | static void blk_delay_work(struct work_struct *work) | 201 | static 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 | } |
| 303 | EXPORT_SYMBOL(blk_sync_queue); | 289 | EXPORT_SYMBOL(blk_sync_queue); |
| 304 | 290 | ||
