diff options
| author | Jens Axboe <axboe@fb.com> | 2015-06-05 18:58:28 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-06-05 18:58:28 +0200 |
| commit | b281ebb817b009dc586347d7800b80944ba3ec18 (patch) | |
| tree | 2d852a75be67ead7e575d08347198c61d738191d | |
| parent | NVMe: Memory barrier before queue_count is incremented (diff) | |
| parent | block: add blk_set_queue_dying() to blkdev.h (diff) | |
| download | linux-b281ebb817b009dc586347d7800b80944ba3ec18.tar.xz linux-b281ebb817b009dc586347d7800b80944ba3ec18.zip | |
Merge branch 'for-4.2/core' into for-4.2/drivers
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ccaa9aecd593..a31380c35918 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1024,6 +1024,7 @@ bool __must_check blk_get_queue(struct request_queue *); struct request_queue *blk_alloc_queue(gfp_t); struct request_queue *blk_alloc_queue_node(gfp_t, int); extern void blk_put_queue(struct request_queue *); +extern void blk_set_queue_dying(struct request_queue *); /* * block layer runtime pm functions |