diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio-integrity.c | 5 | ||||
| -rw-r--r-- | block/blk-core.c | 3 | ||||
| -rw-r--r-- | block/blk.h | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c index 6a90eca..f6325d5 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -32,6 +32,11 @@ static struct kmem_cache *bip_slab; static struct workqueue_struct *kintegrityd_wq; +void blk_flush_integrity(void) +{ + flush_workqueue(kintegrityd_wq); +} + /** * bio_integrity_alloc - Allocate integrity payload and attach it to bio * @bio: bio to attach integrity metadata to diff --git a/block/blk-core.c b/block/blk-core.c index 9b4d735..6ebe33e 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -561,6 +561,9 @@ void blk_cleanup_queue(struct request_queue *q) queue_flag_set(QUEUE_FLAG_DEAD, q); spin_unlock_irq(lock); + /* for synchronous bio-based driver finish in-flight integrity i/o */ + blk_flush_integrity(); + /* @q won't process any more request, flush async actions */ del_timer_sync(&q->backing_dev_info.laptop_mode_wb_timer); blk_sync_queue(q); diff --git a/block/blk.h b/block/blk.h index 5b2cd39..157c93d 100644 --- a/block/blk.h +++ b/block/blk.h @@ -87,6 +87,14 @@ static inline void blk_queue_enter_live(struct request_queue *q) percpu_ref_get(&q->q_usage_counter); } +#ifdef CONFIG_BLK_DEV_INTEGRITY +void blk_flush_integrity(void); +#else +static inline void blk_flush_integrity(void) +{ +} +#endif + void blk_rq_timed_out_timer(unsigned long data); unsigned long blk_rq_timeout(unsigned long timeout); void blk_add_timer(struct request *req); |
