Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3079c22e authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe
Browse files

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: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d52987b5

block/genhd.c

+4 −6
Original line number Diff line number Diff line
@@ -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)

drivers/block/amiflop.c

+1 −1
Original line number Diff line number Diff line
@@ -1758,7 +1758,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data) 
	if (unit[drive].type->code == FD_NODRIVE)

		return NULL;

	*part = 0;

	return get_disk(unit[drive].gendisk);

	return get_disk_and_module(unit[drive].gendisk);

}



static int __init amiga_floppy_probe(struct platform_device *pdev)

drivers/block/ataflop.c

+1 −1
Original line number Diff line number Diff line
@@ -1917,7 +1917,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data) 
	if (drive >= FD_MAX_UNITS || type > NUM_DISK_MINORS)

		return NULL;

	*part = 0;

	return get_disk(unit[drive].disk);

	return get_disk_and_module(unit[drive].disk);

}



static int __init atari_floppy_init (void)

drivers/block/brd.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static struct kobject *brd_probe(dev_t dev, int *part, void *data) 


	mutex_lock(&brd_devices_mutex);

	brd = brd_init_one(MINOR(dev) / max_part, &new);

	kobj = brd ? get_disk(brd->brd_disk) : NULL;

	kobj = brd ? get_disk_and_module(brd->brd_disk) : NULL;

	mutex_unlock(&brd_devices_mutex);



	if (new)

drivers/block/floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -4505,7 +4505,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data) 
	if (((*part >> 2) & 0x1f) >= ARRAY_SIZE(floppy_type))

		return NULL;

	*part = 0;

	return get_disk(disks[drive]);

	return get_disk_and_module(disks[drive]);

}



static int __init do_floppy_init(void)