Commit 8e43c90a authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Jens Axboe
Browse files

block/rnbd: Kill rnbd_clt_destroy_default_group 



No need to have it since we can call sysfs_remove_group in the
rnbd_clt_destroy_sysfs_files.

Then rnbd_clt_destroy_sysfs_files is paired with it's counterpart
rnbd_clt_create_sysfs_files.

Signed-off-by: default avatarGuoqing Jiang <guoqing.jiang@ionos.com>
Reviewed-by: default avatarDanil Kipnis <danil.kipnis@ionos.com>
Signed-off-by: default avatarGioh Kim <gi-oh.kim@ionos.com>
Signed-off-by: default avatarJack Wang <jinpu.wang@ionos.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Link: https://lore.kernel.org/r/20210419073722.15351-7-gi-oh.kim@ionos.com


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

drivers/block/rnbd/rnbd-clt-sysfs.c

+1 −5
Original line number Diff line number Diff line
@@ -639,13 +639,9 @@ int rnbd_clt_create_sysfs_files(void) 
	return err;

}



void rnbd_clt_destroy_default_group(void)

{

	sysfs_remove_group(&rnbd_dev->kobj, &default_attr_group);

}



void rnbd_clt_destroy_sysfs_files(void)

{

	sysfs_remove_group(&rnbd_dev->kobj, &default_attr_group);

	kobject_del(rnbd_devs_kobj);

	kobject_put(rnbd_devs_kobj);

	device_destroy(rnbd_dev_class, MKDEV(0, 0));

drivers/block/rnbd/rnbd-clt.c

+0 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,6 @@ static void rnbd_destroy_sessions(void) 
	struct rnbd_clt_dev *dev, *tn;



	/* Firstly forbid access through sysfs interface */

	rnbd_clt_destroy_default_group();

	rnbd_clt_destroy_sysfs_files();



	/*

drivers/block/rnbd/rnbd-clt.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ int rnbd_clt_resize_disk(struct rnbd_clt_dev *dev, size_t newsize); 
int rnbd_clt_create_sysfs_files(void);



void rnbd_clt_destroy_sysfs_files(void);

void rnbd_clt_destroy_default_group(void);



void rnbd_clt_remove_dev_symlink(struct rnbd_clt_dev *dev);