diff options
-rw-r--r-- | block/blk-core.c | 6 | ||||
-rw-r--r-- | drivers/block/umem.c | 2 | ||||
-rw-r--r-- | drivers/md/md.c | 2 | ||||
-rw-r--r-- | drivers/md/md.h | 2 | ||||
-rw-r--r-- | include/linux/blkdev.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 35bf4fe8234..4b4dbdfbca8 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, | |||
2909 | 2909 | ||
2910 | } | 2910 | } |
2911 | 2911 | ||
2912 | static void flush_plug_callbacks(struct blk_plug *plug) | 2912 | static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule) |
2913 | { | 2913 | { |
2914 | LIST_HEAD(callbacks); | 2914 | LIST_HEAD(callbacks); |
2915 | 2915 | ||
@@ -2921,7 +2921,7 @@ static void flush_plug_callbacks(struct blk_plug *plug) | |||
2921 | struct blk_plug_cb, | 2921 | struct blk_plug_cb, |
2922 | list); | 2922 | list); |
2923 | list_del(&cb->list); | 2923 | list_del(&cb->list); |
2924 | cb->callback(cb); | 2924 | cb->callback(cb, from_schedule); |
2925 | } | 2925 | } |
2926 | } | 2926 | } |
2927 | } | 2927 | } |
@@ -2961,7 +2961,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) | |||
2961 | 2961 | ||
2962 | BUG_ON(plug->magic != PLUG_MAGIC); | 2962 | BUG_ON(plug->magic != PLUG_MAGIC); |
2963 | 2963 | ||
2964 | flush_plug_callbacks(plug); | 2964 | flush_plug_callbacks(plug, from_schedule); |
2965 | if (list_empty(&plug->list)) | 2965 | if (list_empty(&plug->list)) |
2966 | return; | 2966 | return; |
2967 | 2967 | ||
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 6ef3489568e..eb0d8216f55 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
@@ -513,7 +513,7 @@ static void process_page(unsigned long data) | |||
513 | } | 513 | } |
514 | } | 514 | } |
515 | 515 | ||
516 | static void mm_unplug(struct blk_plug_cb *cb) | 516 | static void mm_unplug(struct blk_plug_cb *cb, bool from_schedule) |
517 | { | 517 | { |
518 | struct cardinfo *card = cb->data; | 518 | struct cardinfo *card = cb->data; |
519 | 519 | ||
diff --git a/drivers/md/md.c b/drivers/md/md.c index b493fa41738..db02d2efb76 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -498,7 +498,7 @@ void md_flush_request(struct mddev *mddev, struct bio *bio) | |||
498 | } | 498 | } |
499 | EXPORT_SYMBOL(md_flush_request); | 499 | EXPORT_SYMBOL(md_flush_request); |
500 | 500 | ||
501 | void md_unplug(struct blk_plug_cb *cb) | 501 | void md_unplug(struct blk_plug_cb *cb, bool from_schedule) |
502 | { | 502 | { |
503 | struct mddev *mddev = cb->data; | 503 | struct mddev *mddev = cb->data; |
504 | md_wakeup_thread(mddev->thread); | 504 | md_wakeup_thread(mddev->thread); |
diff --git a/drivers/md/md.h b/drivers/md/md.h index 8f998e08fb8..f385b038589 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h | |||
@@ -629,7 +629,7 @@ extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, | |||
629 | struct mddev *mddev); | 629 | struct mddev *mddev); |
630 | extern void md_trim_bio(struct bio *bio, int offset, int size); | 630 | extern void md_trim_bio(struct bio *bio, int offset, int size); |
631 | 631 | ||
632 | extern void md_unplug(struct blk_plug_cb *cb); | 632 | extern void md_unplug(struct blk_plug_cb *cb, bool from_schedule); |
633 | static inline int mddev_check_plugged(struct mddev *mddev) | 633 | static inline int mddev_check_plugged(struct mddev *mddev) |
634 | { | 634 | { |
635 | return !!blk_check_plugged(md_unplug, mddev, | 635 | return !!blk_check_plugged(md_unplug, mddev, |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 607ca228f47..4e72a9d4823 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -923,7 +923,7 @@ struct blk_plug { | |||
923 | #define BLK_MAX_REQUEST_COUNT 16 | 923 | #define BLK_MAX_REQUEST_COUNT 16 |
924 | 924 | ||
925 | struct blk_plug_cb; | 925 | struct blk_plug_cb; |
926 | typedef void (*blk_plug_cb_fn)(struct blk_plug_cb *); | 926 | typedef void (*blk_plug_cb_fn)(struct blk_plug_cb *, bool); |
927 | struct blk_plug_cb { | 927 | struct blk_plug_cb { |
928 | struct list_head list; | 928 | struct list_head list; |
929 | blk_plug_cb_fn callback; | 929 | blk_plug_cb_fn callback; |