diff options
| author | Jan Kara <jack@suse.cz> | 2018-02-26 13:01:38 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-02-26 09:48:42 -0700 |
| commit | 3079c22ea815775837a4f389ce2f7e1e7b202e09 (patch) | |
| tree | 2210be59a22f091fcc79062255e64aa419c2d70c /block | |
| parent | d52987b524ccd2e2165ddad9bcc087a6c3f5332c (diff) | |
| download | linux-3079c22ea815775837a4f389ce2f7e1e7b202e09.tar.gz linux-3079c22ea815775837a4f389ce2f7e1e7b202e09.tar.bz2 linux-3079c22ea815775837a4f389ce2f7e1e7b202e09.zip | |
genhd: Rename get_disk() to get_disk_and_module()
Rename get_disk() to get_disk_and_module() to make sure what the
function does. It's not a great name but at least it is now clear that
put_disk() is not it's counterpart.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/block/genhd.c b/block/genhd.c index 5098bffe6ba6..21b2843b27d0 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -547,7 +547,7 @@ static int exact_lock(dev_t devt, void *data) { struct gendisk *p = data; - if (!get_disk(p)) + if (!get_disk_and_module(p)) return -1; return 0; } @@ -809,7 +809,7 @@ struct gendisk *get_gendisk(dev_t devt, int *partno) spin_lock_bh(&ext_devt_lock); part = idr_find(&ext_devt_idr, blk_mangle_minor(MINOR(devt))); - if (part && get_disk(part_to_disk(part))) { + if (part && get_disk_and_module(part_to_disk(part))) { *partno = part->partno; disk = part_to_disk(part); } @@ -1456,7 +1456,7 @@ struct gendisk *__alloc_disk_node(int minors, int node_id) } EXPORT_SYMBOL(__alloc_disk_node); -struct kobject *get_disk(struct gendisk *disk) +struct kobject *get_disk_and_module(struct gendisk *disk) { struct module *owner; struct kobject *kobj; @@ -1474,15 +1474,13 @@ struct kobject *get_disk(struct gendisk *disk) return kobj; } - -EXPORT_SYMBOL(get_disk); +EXPORT_SYMBOL(get_disk_and_module); void put_disk(struct gendisk *disk) { if (disk) kobject_put(&disk_to_dev(disk)->kobj); } - EXPORT_SYMBOL(put_disk); static void set_disk_ro_uevent(struct gendisk *gd, int ro) |