Commit 7b47b27f authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Jason Gunthorpe
Browse files

RDMA/rtrs-clt: Consolidate rtrs_clt_destroy_sysfs_root_{folder,files} 

Since the two functions are called together, let's consolidate them in
a new function rtrs_clt_destroy_sysfs_root.

Link: https://lore.kernel.org/r/20201217141915.56989-9-jinpu.wang@cloud.ionos.com


Signed-off-by: default avatarGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 424774c9

drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c

+3 −6
Original line number Diff line number Diff line
@@ -471,15 +471,12 @@ int rtrs_clt_create_sysfs_root_files(struct rtrs_clt *clt) 
	return sysfs_create_group(&clt->dev.kobj, &rtrs_clt_attr_group);

}



void rtrs_clt_destroy_sysfs_root_folders(struct rtrs_clt *clt)

void rtrs_clt_destroy_sysfs_root(struct rtrs_clt *clt)

{

	sysfs_remove_group(&clt->dev.kobj, &rtrs_clt_attr_group);



	if (clt->kobj_paths) {

		kobject_del(clt->kobj_paths);

		kobject_put(clt->kobj_paths);

	}

}
 


void rtrs_clt_destroy_sysfs_root_files(struct rtrs_clt *clt)

{

	sysfs_remove_group(&clt->dev.kobj, &rtrs_clt_attr_group);

}

drivers/infiniband/ulp/rtrs/rtrs-clt.c

+2 −4
Original line number Diff line number Diff line
@@ -2707,8 +2707,7 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops, 
		rtrs_clt_close_conns(sess, true);

		kobject_put(&sess->kobj);

	}

	rtrs_clt_destroy_sysfs_root_files(clt);

	rtrs_clt_destroy_sysfs_root_folders(clt);

	rtrs_clt_destroy_sysfs_root(clt);

	free_clt(clt);



out:
@@ -2725,8 +2724,7 @@ void rtrs_clt_close(struct rtrs_clt *clt) 
	struct rtrs_clt_sess *sess, *tmp;



	/* Firstly forbid sysfs access */

	rtrs_clt_destroy_sysfs_root_files(clt);

	rtrs_clt_destroy_sysfs_root_folders(clt);

	rtrs_clt_destroy_sysfs_root(clt);



	/* Now it is safe to iterate over all paths without locks */

	list_for_each_entry_safe(sess, tmp, &clt->paths_list, s.entry) {

drivers/infiniband/ulp/rtrs/rtrs-clt.h

+1 −2
Original line number Diff line number Diff line
@@ -243,8 +243,7 @@ ssize_t rtrs_clt_reset_all_help(struct rtrs_clt_stats *stats, 
/* rtrs-clt-sysfs.c */



int rtrs_clt_create_sysfs_root_files(struct rtrs_clt *clt);

void rtrs_clt_destroy_sysfs_root_folders(struct rtrs_clt *clt);

void rtrs_clt_destroy_sysfs_root_files(struct rtrs_clt *clt);

void rtrs_clt_destroy_sysfs_root(struct rtrs_clt *clt);



int rtrs_clt_create_sess_files(struct rtrs_clt_sess *sess);

void rtrs_clt_destroy_sess_files(struct rtrs_clt_sess *sess,