diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-16 06:23:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-16 06:23:23 +0300 |
| commit | 463910e2dff580e4e9a678af710b4818b5189691 (patch) | |
| tree | 21b4e53cdbec7e5a537ddfc1598fbf17deae57e2 /block | |
| parent | 22cb7a3ac380ecaab6837670963813599b123a53 (diff) | |
| parent | 510c8a899caf095cb13d09d203573deef15db2fe (diff) | |
| download | linux-463910e2dff580e4e9a678af710b4818b5189691.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio-integrity.c | 6 | ||||
| -rw-r--r-- | block/blk-mq.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c index 83e92beb3c9f..9b1ea478577b 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -387,9 +387,11 @@ static void bio_integrity_verify_fn(struct work_struct *work) */ bool __bio_integrity_endio(struct bio *bio) { - if (bio_op(bio) == REQ_OP_READ && !bio->bi_status) { - struct bio_integrity_payload *bip = bio_integrity(bio); + struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev); + struct bio_integrity_payload *bip = bio_integrity(bio); + if (bio_op(bio) == REQ_OP_READ && !bio->bi_status && + (bip->bip_flags & BIP_BLOCK_INTEGRITY) && bi->profile->verify_fn) { INIT_WORK(&bip->bip_work, bio_integrity_verify_fn); queue_work(kintegrityd_wq, &bip->bip_work); return false; diff --git a/block/blk-mq.c b/block/blk-mq.c index 211ef367345f..535cbdf32aab 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -684,8 +684,8 @@ EXPORT_SYMBOL(blk_mq_kick_requeue_list); void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs) { - kblockd_schedule_delayed_work(&q->requeue_work, - msecs_to_jiffies(msecs)); + kblockd_mod_delayed_work_on(WORK_CPU_UNBOUND, &q->requeue_work, + msecs_to_jiffies(msecs)); } EXPORT_SYMBOL(blk_mq_delay_kick_requeue_list); |