summaryrefslogtreecommitdiffstats
path: root/block/blk-core.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-07-31 09:08:15 +0200
committerJens Axboe <axboe@kernel.dk>2012-07-31 09:08:15 +0200
commit74018dc3063a2c729fc73041c0a9f03aac995920 (patch)
tree03f01bca3a2d9f7cf31785fbe74e9ab76bb0d4cd /block/blk-core.c
parent2a7d5559b346574057dce4672d1ed9aaa9d1e685 (diff)
downloadlinux-74018dc3063a2c729fc73041c0a9f03aac995920.tar.bz2
blk: pass from_schedule to non-request unplug functions.
This will allow md/raid to know why the unplug was called, and will be able to act according - if !from_schedule it is safe to perform tasks which could themselves schedule. Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
-rw-r--r--block/blk-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 35bf4fe8234c..4b4dbdfbca89 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2909,7 +2909,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth,
}
-static void flush_plug_callbacks(struct blk_plug *plug)
+static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule)
{
LIST_HEAD(callbacks);
@@ -2921,7 +2921,7 @@ static void flush_plug_callbacks(struct blk_plug *plug)
struct blk_plug_cb,
list);
list_del(&cb->list);
- cb->callback(cb);
+ cb->callback(cb, from_schedule);
}
}
}
@@ -2961,7 +2961,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
BUG_ON(plug->magic != PLUG_MAGIC);
- flush_plug_callbacks(plug);
+ flush_plug_callbacks(plug, from_schedule);
if (list_empty(&plug->list))
return;