diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 17:26:10 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 17:26:10 +0900 |
| commit | e78e4626d43ce3143cb6d2942735d75595be7d1e (patch) | |
| tree | 426472aebfe0d0df91400d306836be65af9bd535 /include | |
| parent | cbfb74973753e109f28705f6b98c8c8cc381b047 (diff) | |
| parent | dc9edc44de6cd7cc8cc7f5b36c1adb221eda3207 (diff) | |
| download | linux-e78e4626d43ce3143cb6d2942735d75595be7d1e.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fix from Jens Axboe:
"Just a single fix this week, fixing a regression introduced in this
release.
When we put the final reference to the queue, we may need to block.
Ensure that we can safely do so. From Bart"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: Fix a blk_exit_rl() regression
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ab92c4ea138b..b74a3edcb3da 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -586,6 +586,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 */ |