Commit 8b9ab626 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove blk_cleanup_disk 



blk_cleanup_disk is nothing but a trivial wrapper for put_disk now,
so remove it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20220619060552.1850436-7-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6f8191fd

arch/m68k/emu/nfblock.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int __init nfhd_init_one(int id, u32 blocks, u32 bsize) 
	return 0;



out_cleanup_disk:

	blk_cleanup_disk(dev->disk);

	put_disk(dev->disk);

free_dev:

	kfree(dev);

out:
@@ -180,7 +180,7 @@ static void __exit nfhd_exit(void) 
	list_for_each_entry_safe(dev, next, &nfhd_list, list) {

		list_del(&dev->list);

		del_gendisk(dev->disk);

		blk_cleanup_disk(dev->disk);

		put_disk(dev->disk);

		kfree(dev);

	}

	unregister_blkdev(major_num, "nfhd");

arch/um/drivers/ubd_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static int ubd_add(int n, char **error_out) 
	return 0;



out_cleanup_disk:

	blk_cleanup_disk(disk);

	put_disk(disk);

out_cleanup_tags:

	blk_mq_free_tag_set(&ubd_dev->tag_set);

out:
@@ -1032,7 +1032,7 @@ static int ubd_remove(int n, char **error_out) 
	ubd_gendisk[n] = NULL;

	if(disk != NULL){

		del_gendisk(disk);

		blk_cleanup_disk(disk);

		put_disk(disk);

	}



	err = 0;

arch/xtensa/platforms/iss/simdisk.c

+2 −2
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int __init simdisk_setup(struct simdisk *dev, int which, 
	return 0;



out_cleanup_disk:

	blk_cleanup_disk(dev->gd);

	put_disk(dev->gd);

out:

	return err;

}
@@ -344,7 +344,7 @@ static void simdisk_teardown(struct simdisk *dev, int which, 
	simdisk_detach(dev);

	if (dev->gd) {

		del_gendisk(dev->gd);

		blk_cleanup_disk(dev->gd);

		put_disk(dev->gd);

	}

	remove_proc_entry(tmp, procdir);

}

block/genhd.c

+0 −15
Original line number Diff line number Diff line
@@ -1432,21 +1432,6 @@ void put_disk(struct gendisk *disk) 
}

EXPORT_SYMBOL(put_disk);



/**

 * blk_cleanup_disk - shutdown a gendisk allocated by blk_alloc_disk

 * @disk: gendisk to shutdown

 *

 * Mark the queue hanging off @disk DYING, drain all pending requests, then mark

 * the queue DEAD, destroy and put it and the gendisk structure.

 *

 * Context: can sleep

 */

void blk_cleanup_disk(struct gendisk *disk)

{

	put_disk(disk);

}

EXPORT_SYMBOL(blk_cleanup_disk);



static void set_disk_ro_uevent(struct gendisk *gd, int ro)

{

	char event[] = "DISK_RO=1";

drivers/block/amiflop.c

+1 −1
Original line number Diff line number Diff line
@@ -1802,7 +1802,7 @@ static int fd_alloc_disk(int drive, int system) 
	unit[drive].gendisk[system] = disk;

	err = add_disk(disk);

	if (err)

		blk_cleanup_disk(disk);

		put_disk(disk);

	return err;

}