diff --git a/[refs] b/[refs] index d2c57deaa99f..473b0e9bce15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4310864b9d17714e64446bfb8bc7dbcb96454475 +refs/heads/master: abbeb88d00bef294ce661a9229c1dc31be064545 diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c index 49c0f18cb783..d8616e6ebd92 100644 --- a/trunk/block/ll_rw_blk.c +++ b/trunk/block/ll_rw_blk.c @@ -1738,6 +1738,7 @@ EXPORT_SYMBOL(blk_stop_queue); void blk_sync_queue(struct request_queue *q) { del_timer_sync(&q->unplug_timer); + kblockd_flush_work(&q->unplug_work); } EXPORT_SYMBOL(blk_sync_queue);