From: Jack Wang <jinpu.wang@cloud.ionos.com>
To: linux-rdma@vger.kernel.org
Cc: bvanassche@acm.org, leon@kernel.org, dledford@redhat.com,
jgg@ziepe.ca, danil.kipnis@cloud.ionos.com,
jinpu.wang@cloud.ionos.com,
Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Subject: [PATCHv2 for-next 08/19] RDMA/rtrs-clt: Consolidate rtrs_clt_destroy_sysfs_root_{folder,files}
Date: Thu, 17 Dec 2020 15:19:04 +0100 [thread overview]
Message-ID: <20201217141915.56989-9-jinpu.wang@cloud.ionos.com> (raw)
In-Reply-To: <20201217141915.56989-1-jinpu.wang@cloud.ionos.com>
From: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Since the two functions are called together, let's consolidate them in
a new function rtrs_clt_destroy_sysfs_root.
Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@cloud.ionos.com>
---
drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 9 +++------
drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 ++----
drivers/infiniband/ulp/rtrs/rtrs-clt.h | 3 +--
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c b/drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c
index ad77659800cd..b6a0abf40589 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c
@@ -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);
-}
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
index b3fb5fb93815..99fc34950032 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -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) {
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.h b/drivers/infiniband/ulp/rtrs/rtrs-clt.h
index b8dbd701b3cb..a97a068c4c28 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.h
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.h
@@ -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,
--
2.25.1
next prev parent reply other threads:[~2020-12-17 14:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 14:18 [PATCHv2 for-next 00/19] Misc update for rtrs Jack Wang
2020-12-17 14:18 ` [PATCHv2 for-next 01/19] RDMA/rtrs: Extend ibtrs_cq_qp_create Jack Wang
2020-12-17 14:18 ` [PATCHv2 for-next 02/19] RMDA/rtrs-srv: Occasionally flush ongoing session closing Jack Wang
2021-01-12 19:13 ` Jason Gunthorpe
2021-01-13 8:55 ` Jinpu Wang
2020-12-17 14:18 ` [PATCHv2 for-next 03/19] RDMA/rtrs-srv: Release lock before call into close_sess Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 04/19] RDMA/rtrs-srv: Use sysfs_remove_file_self for disconnect Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 05/19] RDMA/rtrs-clt: Set mininum limit when create QP Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 06/19] RDMA/rtrs-srv: Jump to dereg_mr label if allocate iu fails Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 07/19] RDMA/rtrs: Call kobject_put in the failure path Jack Wang
2020-12-17 14:19 ` Jack Wang [this message]
2020-12-17 14:19 ` [PATCHv2 for-next 09/19] RDMA/rtrs-clt: Kill wait_for_inflight_permits Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 10/19] RDMA/rtrs-clt: Remove unnecessary 'goto out' Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 11/19] RDMA/rtrs-clt: Kill rtrs_clt_change_state Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 12/19] RDMA/rtrs-clt: Rename __rtrs_clt_change_state to rtrs_clt_change_state Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 13/19] RDMA/rtrs-srv: Fix missing wr_cqe Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 14/19] RDMA/rtrs-clt: Refactor the failure cases in alloc_clt Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 15/19] RDMA/rtrs: Do not signal for heatbeat Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 16/19] RDMA/rtrs-clt: Use bitmask to check sess->flags Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 17/19] RDMA/rtrs-srv: Do not signal REG_MR Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 18/19] RDMA/rtrs-srv: Init wr_cnt as 1 Jack Wang
2020-12-17 14:19 ` [PATCHv2 for-next 19/19] RDMA/rtrs: Fix KASAN: stack-out-of-bounds bug Jack Wang
2021-01-11 7:04 ` [PATCHv2 for-next 00/19] Misc update for rtrs Jinpu Wang
2021-01-15 19:48 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201217141915.56989-9-jinpu.wang@cloud.ionos.com \
--to=jinpu.wang@cloud.ionos.com \
--cc=bvanassche@acm.org \
--cc=danil.kipnis@cloud.ionos.com \
--cc=dledford@redhat.com \
--cc=guoqing.jiang@cloud.ionos.com \
--cc=jgg@ziepe.ca \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.