diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-01-10 12:36:07 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-01-10 12:36:07 -0700 |
| commit | ad12f83fa192f8205bad87411c5d82aa3f4a7c91 (patch) | |
| tree | f2192455739ed15b35dc721afc6342c501350f0a /block | |
| parent | 8c4b0f9c6a652960e46062f75969c7c14540b7f9 (diff) | |
| parent | b7435db8b8d11df94453708295c2ea5b09caff5f (diff) | |
Merge branch 'for-4.16/block' into for-next
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 435a5a0d441f..8000ba6db07d 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -559,6 +559,7 @@ static void __blk_mq_complete_request(struct request *rq) } static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx) + __releases(hctx->srcu) { if (!(hctx->flags & BLK_MQ_F_BLOCKING)) rcu_read_unlock(); @@ -567,6 +568,7 @@ static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx) } static void hctx_lock(struct blk_mq_hw_ctx *hctx, int *srcu_idx) + __acquires(hctx->srcu) { if (!(hctx->flags & BLK_MQ_F_BLOCKING)) { /* shut up gcc false positive */ |