git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
bio: move the slab pointer inside the bio_set
[pandora-kernel.git]
/
block
/
cfq-iosched.c
diff --git
a/block/cfq-iosched.c
b/block/cfq-iosched.c
index
6a062ee
..
a2bfec7
100644
(file)
--- a/
block/cfq-iosched.c
+++ b/
block/cfq-iosched.c
@@
-2160,7
+2160,7
@@
out_cont:
static void cfq_shutdown_timer_wq(struct cfq_data *cfqd)
{
del_timer_sync(&cfqd->idle_slice_timer);
-
kblockd_flush_work
(&cfqd->unplug_work);
+
cancel_work_sync
(&cfqd->unplug_work);
}
static void cfq_put_async_queues(struct cfq_data *cfqd)