diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-06-23 06:55:24 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-23 06:55:24 +0300 |
| commit | f95a0d6a95b12a79b7492da7ab687ae4cd741124 (patch) | |
| tree | 503ad30af40e94bbc090fc7de45a051030646141 /include/linux/blkdev.h | |
| parent | a9590fe148c03cb4157b56255357419cb4e14124 (diff) | |
| parent | 8e8320c9315c47a6a090188720ccff32a6a6ba18 (diff) | |
| download | linux-f95a0d6a95b12a79b7492da7ab687ae4cd741124.tar.xz | |
Merge commit '8e8320c9315c' into for-4.13/block
Pull in the fix for shared tags, as it conflicts with the pending
changes in for-4.13/block. We already pulled in v4.12-rc5 to solve
other conflicts or get fixes that went into 4.12, so not a lot
of changes in this merge.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 3e60e7a654bd..bf2157141d53 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -391,6 +391,8 @@ struct request_queue { int nr_rqs[2]; /* # allocated [a]sync rqs */ int nr_rqs_elvpriv; /* # allocated rqs w/ elvpriv */ + atomic_t shared_hctx_restart; + struct blk_queue_stats *stats; struct rq_wb *rq_wb; @@ -590,6 +592,8 @@ struct request_queue { size_t cmd_size; void *rq_alloc_data; + + struct work_struct release_work; }; #define QUEUE_FLAG_QUEUED 1 /* uses generic tag queueing */ |