Commit 763b5892 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Jens Axboe

block: clarify context for refcount increment helpers

Let us clarify the context under which the helpers to increment the
refcount for the gendisk and request_queue can be called under. We
make this explicit on the places where we may sleep with might_sleep().

We don't address the decrement context yet, as that needs some extra
work and fixes, but will be addressed in the next patch.
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b5bd357c
...@@ -610,6 +610,8 @@ EXPORT_SYMBOL(blk_alloc_queue); ...@@ -610,6 +610,8 @@ EXPORT_SYMBOL(blk_alloc_queue);
* @q: the request_queue structure to increment the refcount for * @q: the request_queue structure to increment the refcount for
* *
* Increment the refcount of the request_queue kobject. * Increment the refcount of the request_queue kobject.
*
* Context: Any context.
*/ */
bool blk_get_queue(struct request_queue *q) bool blk_get_queue(struct request_queue *q)
{ {
......
...@@ -985,11 +985,15 @@ static ssize_t disk_badblocks_store(struct device *dev, ...@@ -985,11 +985,15 @@ static ssize_t disk_badblocks_store(struct device *dev,
* *
* This function gets the structure containing partitioning * This function gets the structure containing partitioning
* information for the given device @devt. * information for the given device @devt.
*
* Context: can sleep
*/ */
struct gendisk *get_gendisk(dev_t devt, int *partno) struct gendisk *get_gendisk(dev_t devt, int *partno)
{ {
struct gendisk *disk = NULL; struct gendisk *disk = NULL;
might_sleep();
if (MAJOR(devt) != BLOCK_EXT_MAJOR) { if (MAJOR(devt) != BLOCK_EXT_MAJOR) {
struct kobject *kobj; struct kobject *kobj;
...@@ -1764,6 +1768,8 @@ EXPORT_SYMBOL(__alloc_disk_node); ...@@ -1764,6 +1768,8 @@ EXPORT_SYMBOL(__alloc_disk_node);
* *
* This increments the refcount for the struct gendisk, and the gendisk's * This increments the refcount for the struct gendisk, and the gendisk's
* fops module owner. * fops module owner.
*
* Context: Any context.
*/ */
struct kobject *get_disk_and_module(struct gendisk *disk) struct kobject *get_disk_and_module(struct gendisk *disk)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment