RTRS renaming
Subsystems (4)
Jack Wang
maintainerv2 cover RTRS renaming
Hi Jason, hi Leon,
This patchset from Vaishali, renames a few internal structures to make the code easier to understand.
rtrs_sess is in fact a path. rtrs_clt/_srv is in fact a session. This is a mess and makes it difficult to get into the code.
The patchset is based on rdma/for-next:c8f476da84ad ("Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux")
v2: merge first 3 patches to one to be bisectable. (Thanks Guoqing)
v1: https://lore.kernel.org/linux-rdma/[email protected]/T/#md5be427877cbfcb1741cccea4d081df09ae18561
Happy New Year!
Vaishali Thakkar (5):
RDMA/rtrs: Rename rtrs_sess to rtrs_path RDMA/rtrs-srv: Rename rtrs_srv_sess to rtrs_srv_path RDMA/rtrs-clt: Rename rtrs_clt_sess to rtrs_clt_path RDMA/rtrs-srv: Rename rtrs_srv to rtrs_srv_sess RDMA/rtrs-clt: Rename rtrs_clt to rtrs_clt_sess
drivers/block/rnbd/rnbd-clt.c | 4 +- drivers/block/rnbd/rnbd-clt.h | 2 +- drivers/block/rnbd/rnbd-srv.c | 8 +- drivers/block/rnbd/rnbd-srv.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 8 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 145 +-- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 1083 +++++++++--------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 41 +- drivers/infiniband/ulp/rtrs/rtrs-pri.h | 14 +- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 121 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 664 +++++------ drivers/infiniband/ulp/rtrs/rtrs-srv.h | 16 +- drivers/infiniband/ulp/rtrs/rtrs.c | 98 +- drivers/infiniband/ulp/rtrs/rtrs.h | 34 +- 14 files changed, 1138 insertions(+), 1102 deletions(-)
Signature · 1 line
2.25.1
Jack Wang
maintainerPATCH v2 1/5 RDMA/rtrs: Rename rtrs_sess to rtrs_path
From: Vaishali Thakkar <[email protected]>
rtrs_sess is in fact a path. This makes it confusing and difficult to get into the code. So let's rename the structure and related use cases of it.
Coccinelle was used to do the transformation for most of the occurrences and remaining ones were handled manually.
--- drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 4 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 66 ++++++------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 4 +- drivers/infiniband/ulp/rtrs/rtrs-pri.h | 14 +-- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 6 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 46 ++++----- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs.c | 98 ++++++++++---------- 8 files changed, 120 insertions(+), 120 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +2 -2
@@ -13,7 +13,7 @@void rtrs_clt_update_wc_stats (struct rtrs_clt_con *con) { -struct rtrs_clt_sess *sess =to_clt_sess (con->c.sess); +struct rtrs_clt_sess *sess =to_clt_sess (con->c.path);struct rtrs_clt_stats *stats = sess->stats;struct rtrs_clt_stats_pcpu *s;int cpu;
@@ -180,7 +180,7 @@ static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats,void rtrs_clt_update_all_stats (struct rtrs_clt_io_req *req,int dir) {struct rtrs_clt_con *con = req->con; -struct rtrs_clt_sess *sess =to_clt_sess (con->c.sess); +struct rtrs_clt_sess *sess =to_clt_sess (con->c.path);struct rtrs_clt_stats *stats = sess->stats;unsigned int len;
drivers/infiniband/ulp/rtrs/rtrs-clt.c +33 -33
262 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-clt.h +2 -2
@@ -125,7 +125,7 @@ struct rtrs_rbuf { };struct rtrs_clt_sess { -struct rtrs_sess s; +struct rtrs_path s;struct rtrs_clt *clt;wait_queue_head_t state_wq;enum rtrs_clt_state state;
@@ -186,7 +186,7 @@ static inline struct rtrs_clt_con *to_clt_con(struct rtrs_con *c) return container_of(c, struct rtrs_clt_con, c); } -static inline struct rtrs_clt_sess *to_clt_sess (struct rtrs_sess *s) +static inline struct rtrs_clt_sess *to_clt_sess (struct rtrs_path *s) { return container_of(s, struct rtrs_clt_sess, s); }
drivers/infiniband/ulp/rtrs/rtrs-pri.h +7 -7
@@ -90,7 +90,7 @@ struct rtrs_ib_dev { };struct rtrs_con { -struct rtrs_sess *sess; +struct rtrs_path *path;struct ib_qp *qp;struct ib_cq *cq;struct rdma_cm_id *cm_id;
@@ -100,7 +100,7 @@ struct rtrs_con {atomic_t sq_wr_avail; }; -struct rtrs_sess { +struct rtrs_path {struct list_head entry;struct sockaddr_storage dst_addr;struct sockaddr_storage src_addr;
@@ -313,19 +313,19 @@ int rtrs_iu_post_rdma_write_imm(struct rtrs_con *con, struct rtrs_iu *iu,int rtrs_post_recv_empty (struct rtrs_con *con,struct ib_cqe *cqe); -int rtrs_cq_qp_create (struct rtrs_sess *sess,struct rtrs_con *con, +int rtrs_cq_qp_create (struct rtrs_path *path,struct rtrs_con *con,u32 max_send_sge,int cq_vector,int nr_cqe,u32 max_send_wr,u32 max_recv_wr,enum ib_poll_context poll_ctx);void rtrs_cq_qp_destroy (struct rtrs_con *con); -void rtrs_init_hb (struct rtrs_sess *sess,struct ib_cqe *cqe, +void rtrs_init_hb (struct rtrs_path *path,struct ib_cqe *cqe,unsigned int interval_ms,unsigned int missed_max,void (*err_handler)(struct rtrs_con *con),struct workqueue_struct *wq); -void rtrs_start_hb (struct rtrs_sess *sess); -void rtrs_stop_hb (struct rtrs_sess *sess); -void rtrs_send_hb_ack (struct rtrs_sess *sess); +void rtrs_start_hb (struct rtrs_path *path); +void rtrs_stop_hb (struct rtrs_path *path); +void rtrs_send_hb_ack (struct rtrs_path *path);void rtrs_rdma_dev_pd_init (enum ib_pd_flags pd_flags,struct rtrs_rdma_dev_pd *pool);
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +3 -3
@@ -37,7 +37,7 @@ static ssize_t rtrs_srv_disconnect_store(struct kobject *kobj, const char *buf, size_t count) {struct rtrs_srv_sess *sess; -struct rtrs_sess *s; +struct rtrs_path *s;char str[MAXHOSTNAMELEN ]; sess = container_of(kobj, struct rtrs_srv_sess, kobj);
@@ -230,7 +230,7 @@ static struct kobj_type ktype_stats = {static int rtrs_srv_create_stats_files (struct rtrs_srv_sess *sess) {int err; -struct rtrs_sess *s = &sess->s; +struct rtrs_path *s = &sess->s; err =kobject_init_and_add (&sess->stats->kobj_stats, &ktype_stats, &sess->kobj,"stats" );
@@ -258,7 +258,7 @@ static int rtrs_srv_create_stats_files(struct rtrs_srv_sess *sess)int rtrs_srv_create_sess_files (struct rtrs_srv_sess *sess) {struct rtrs_srv *srv = sess->srv; -struct rtrs_sess *s = &sess->s; +struct rtrs_path *s = &sess->s;char str[NAME_MAX ];int err;struct rtrs_addr path = {
drivers/infiniband/ulp/rtrs/rtrs-srv.c +23 -23
182 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-srv.h +1 -1
@@ -72,7 +72,7 @@ struct rtrs_srv_mr { };struct rtrs_srv_sess { -struct rtrs_sess s; +struct rtrs_path s;struct rtrs_srv *srv;struct work_struct close_work;enum rtrs_srv_state state;
drivers/infiniband/ulp/rtrs/rtrs.c +49 -49
230 lines not on this page · raw message
Signature · 1 line
2.25.1
Jack Wang
maintainerPATCH v2 2/5 RDMA/rtrs-srv: Rename rtrs_srv_sess to rtrs_srv_path
In reply to Jack WangFrom: Vaishali Thakkar <[email protected]>
rtrs_srv_sess is used for paths and not sessions on the server side. This creates confusion so let's rename it to rtrs_srv_path. Also, rename related variables and functions.
Coccinelle is used to do the transformations for most of the occurrences and remaining ones were handled manually.
--- drivers/block/rnbd/rnbd-srv.c | 4 +- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 119 ++-- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 606 ++++++++++--------- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 10 +- drivers/infiniband/ulp/rtrs/rtrs.h | 2 +- 5 files changed, 375 insertions(+), 366 deletions(-)
drivers/block/rnbd/rnbd-srv.c +2 -2
@@ -269,9 +269,9 @@ static int create_sess(struct rtrs_srv *rtrs)char sessname[NAME_MAX ];int err; - err =rtrs_srv_get_sess_name (rtrs, sessname,sizeof (sessname)); + err =rtrs_srv_get_path_name (rtrs, sessname,sizeof (sessname));if (err) { -pr_err ("rtrs_srv_get_sess_name(%s): %d\n" , sessname, err); +pr_err ("rtrs_srv_get_path_name(%s): %d\n" , sessname, err);return err; }
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +60 -59
271 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-srv.c +307 -299
1,412 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-srv.h +5 -5
@@ -37,7 +37,7 @@ struct rtrs_srv_stats_rdma_stats {struct rtrs_srv_stats {struct kobject kobj_stats;struct rtrs_srv_stats_rdma_stats rdma_stats; -struct rtrs_srv_sess *sess; +struct rtrs_srv_path *srv_path; };struct rtrs_srv_con {
@@ -71,7 +71,7 @@ struct rtrs_srv_mr {struct rtrs_iu *iu;/* send buffer for new rkey msg */ }; -struct rtrs_srv_sess { +struct rtrs_srv_path {struct rtrs_path s;struct rtrs_srv *srv;struct work_struct close_work;
@@ -125,7 +125,7 @@ struct rtrs_srv_ib_ctx {extern struct class *rtrs_dev_class; -void close_sess (struct rtrs_srv_sess *sess); +void close_path (struct rtrs_srv_path *srv_path);static inline void rtrs_srv_update_rdma_stats (struct rtrs_srv_stats *s,size_t size,int d)
@@ -142,7 +142,7 @@ ssize_t rtrs_srv_reset_all_help(struct rtrs_srv_stats *stats, char *page, size_t len);/* functions which are implemented in rtrs-srv-sysfs.c */ -int rtrs_srv_create_sess_files (struct rtrs_srv_sess *sess); -void rtrs_srv_destroy_sess_files (struct rtrs_srv_sess *sess); +int rtrs_srv_create_path_files (struct rtrs_srv_path *srv_path); +void rtrs_srv_destroy_path_files (struct rtrs_srv_path *srv_path);#endif /* RTRS_SRV_H */
drivers/infiniband/ulp/rtrs/rtrs.h +1 -1
@@ -175,7 +175,7 @@ bool rtrs_srv_resp_rdma(struct rtrs_srv_op *id, int errno);void rtrs_srv_set_sess_priv (struct rtrs_srv *sess,void *priv); -int rtrs_srv_get_sess_name (struct rtrs_srv *sess,char *sessname,size_t len); +int rtrs_srv_get_path_name (struct rtrs_srv *sess,char *sessname,size_t len);int rtrs_srv_get_queue_depth (struct rtrs_srv *sess);
Signature · 1 line
2.25.1
Re: [PATCHv2 for-next 2/5] RDMA/rtrs-srv: Rename rtrs_srv_sess to rtrs_srv_path
drivers/block/rnbd/rnbd-srv.c static int create_sess(struct rtrs_srv *rtrs) · line 269
Quoted 4 lines · Jack Wang
drivers/block/rnbd/rnbd-srv.c +0
-0@@ -269,9 +269,9 @@ static int create_sess(struct rtrs_srv *rtrs)char sessname[NAME_MAX ];
It is pathname with the change.
Quoted 10 lines
drivers/block/rnbd/rnbd-srv.c +2
-2int err; - err =rtrs_srv_get_sess_name (rtrs, sessname,sizeof (sessname)); + err =rtrs_srv_get_path_name (rtrs, sessname,sizeof (sessname));if (err) { -pr_err ("rtrs_srv_get_sess_name(%s): %d\n" , sessname, err); +pr_err ("rtrs_srv_get_path_name(%s): %d\n" , sessname, err);return err; }
[ ... ]
drivers/block/rnbd/rnbd-srv.c
Quoted 2 lines
drivers/block/rnbd/rnbd-srv.c +1
-1-void close_sess (struct rtrs_srv_sess *sess) +void close_path (struct rtrs_srv_path *srv_path)
I guess close_srv_path is better if it has counterpart in rtrs-clt.c.
[ ... ]
Quoted 2 lines
rtrs_err_rl(s,
"Sending I/O response failed, session %s is disconnected, sess state %s\n",
With the change, the above should print path instead of session.
Quoted 6 lines
drivers/block/rnbd/rnbd-srv.c +2
-2-kobject_name (&sess->kobj), - rtrs_srv_state_str(sess->state)); +kobject_name (&srv_path->kobj), + rtrs_srv_state_str(srv_path->state)); goto out; }
drivers/block/rnbd/rnbd-srv.c
Quoted 10 lines
drivers/block/rnbd/rnbd-srv.c +2
-2if (always_invalidate) { -struct rtrs_srv_mr *mr = &sess->mrs[id->msg_id]; +struct rtrs_srv_mr *mr = &srv_path->mrs[id->msg_id];ib_update_fast_reg_key (mr->mr,ib_inc_rkey (mr->mr->rkey)); }if (atomic_sub_return (1 , &con->c.sq_wr_avail) <0 ) { rtrs_err(s, "IB send queue full:*sess*=%s cid=%d\n", - kobject_name(&sess->kobj), + kobject_name(&srv_path->kobj),
Ditto.
drivers/block/rnbd/rnbd-srv.c bool rtrs_srv_resp_rdma(struct rtrs_srv_op *id, int status) · line 531
Quoted 11 lines
con->c.cid); atomic_add(1, &con->c.sq_wr_avail); spin_lock(&con->rsp_wr_wait_lock);drivers/block/rnbd/rnbd-srv.c +2
-2@@ -524,11 +527,11 @@ bool rtrs_srv_resp_rdma(struct rtrs_srv_op *id, int status)if (err) {rtrs_err_rl (s,"IO response failed: %d:*sess*=%s\n" , err, -kobject_name (&sess->kobj)); -close_sess (sess); +kobject_name (&srv_path->kobj)); +close_path (srv_path);
Ditto.
[ ... ]
Quoted 10 lines
drivers/block/rnbd/rnbd-srv.c +1
-1@@ -754,7 +757,7 @@ static bool exist_sessname(struct rtrs_srv_ctx *ctx, const char *sessname, const uuid_t *path_uuid) { struct rtrs_srv *srv; -struct rtrs_srv_sess *sess; +struct rtrs_srv_path *srv_path;bool found = false;mutex_lock (&ctx->srv_mutex);
drivers/block/rnbd/rnbd-srv.c static bool exist_sessname(struct rtrs_srv_ctx *ctx, · line 775
Quoted 9 lines
drivers/block/rnbd/rnbd-srv.c +3
-3@@ -767,9 +770,9 @@ static bool exist_sessname(struct rtrs_srv_ctx *ctx,continue ; } -list_for_each_entry (sess, &srv->paths_list, s.entry) { -if (strlen (sess->s.sessname) ==strlen (sessname) && - !strcmp (sess->s.sessname, sessname)) { +list_for_each_entry (srv_path, &srv->paths_list, s.entry) { +if (strlen (srv_path->s.sessname) ==strlen (sessname) && + !strcmp (srv_path->s.sessname, sessname)) {
I am wondering if the sessname should be replaced with pathname, pls double check. Does it make sense to add the definitions about "path" and "session" somewhere such as in README?
[ ... ]
drivers/block/rnbd/rnbd-srv.c static bool exist_sessname(struct rtrs_srv_ctx *ctx, · line 776
Quoted 3 lines
drivers/block/rnbd/rnbd-srv.c +1
-1-static int post_recv_sess (struct rtrs_srv_sess *sess) +static int post_recv_sess (struct rtrs_srv_path *srv_path)
post_recv_path?
Quoted 20 lines
drivers/block/rnbd/rnbd-srv.c +4
-4{ -struct rtrs_srv *srv = sess->srv; -struct rtrs_path *s = &sess->s; +struct rtrs_srv *srv = srv_path->srv; +struct rtrs_path *s = &srv_path->s;size_t q_size;int err, cid; -for (cid =0 ; cid < sess->s.con_num; cid++) { +for (cid =0 ; cid < srv_path->s.con_num; cid++) {if (cid ==0 ) q_size =SERVICE_CON_QUEUE_DEPTH ;else q_size = srv->queue_depth; - err =post_recv_io (to_srv_con (sess->s.con[cid]), q_size); + err =post_recv_io (to_srv_con (srv_path->s.con[cid]), q_size);if (err) {rtrs_err (s,"post_recv_io(), err: %d\n" , err);return err;
[ .. ]
drivers/block/rnbd/rnbd-srv.c
Quoted 9 lines
/**
- *rtrs_srv_get_sess_name()- Getrtrs_srvpeer hostname.
+ *rtrs_srv_get_path_name()- Getrtrs_srvpeer hostname.
* @srv: Session
* @sessname: Sessname buffer
* @len: Length of sessname buffer
*/drivers/block/rnbd/rnbd-srv.c +1
-1-int rtrs_srv_get_sess_name (struct rtrs_srv *srv,char *sessname,size_t len) +int rtrs_srv_get_path_name (struct rtrs_srv *srv,char *sessname,size_t len)
The "sessname" argument is actually for path, right?
Quoted 19 lines
{drivers/block/rnbd/rnbd-srv.c +5
-5-struct rtrs_srv_sess *sess; +struct rtrs_srv_path *srv_path;int err = -ENOTCONN ;mutex_lock (&srv->paths_mutex); -list_for_each_entry (sess, &srv->paths_list, s.entry) { -if (sess->state !=RTRS_SRV_CONNECTED ) +list_for_each_entry (srv_path, &srv->paths_list, s.entry) { +if (srv_path->state !=RTRS_SRV_CONNECTED )continue ; -strscpy (sessname, sess->s.sessname, -min_t (size_t,sizeof (sess->s.sessname), len)); +strscpy (sessname, srv_path->s.sessname, +min_t (size_t,sizeof (srv_path->s.sessname), len)); err =0 ;break ; }
drivers/block/rnbd/rnbd-srv.c int rtrs_srv_get_sess_name(struct rtrs_srv *srv, char *sessname, size_t len) · line 1316
Quoted 5 lines
drivers/block/rnbd/rnbd-srv.c +1
-1@@ -1307,7 +1313,7 @@ int rtrs_srv_get_sess_name(struct rtrs_srv *srv, char *sessname, size_t len)return err; } -EXPORT_SYMBOL (rtrs_srv_get_sess_name); +EXPORT_SYMBOL (rtrs_srv_get_path_name);
[ ... ]
Thanks,
Guoqing
Jack Wang
maintainerPATCH v2 3/5 RDMA/rtrs-clt: Rename rtrs_clt_sess to rtrs_clt_path
In reply to Jack WangFrom: Vaishali Thakkar <[email protected]>
rtrs_clt_sess is used for paths and not sessions on the client side. This creates confusion so let's rename it to rtrs_clt_path. Also, rename related variables and functions.
Coccinelle is used to do the transformations for most of the occurrences and remaining ones were handled manually.
--- drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c | 8 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 123 +-- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 993 ++++++++++--------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 20 +- drivers/infiniband/ulp/rtrs/rtrs.h | 4 +- 5 files changed, 583 insertions(+), 565 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt-stats.c +4 -4
@@ -13,8 +13,8 @@void rtrs_clt_update_wc_stats (struct rtrs_clt_con *con) { -struct rtrs_clt_sess *sess =to_clt_sess (con->c.path); -struct rtrs_clt_stats *stats = sess->stats; +struct rtrs_clt_path *clt_path =to_clt_path (con->c.path); +struct rtrs_clt_stats *stats = clt_path->stats;struct rtrs_clt_stats_pcpu *s;int cpu;
@@ -180,8 +180,8 @@ static inline void rtrs_clt_update_rdma_stats(struct rtrs_clt_stats *stats,void rtrs_clt_update_all_stats (struct rtrs_clt_io_req *req,int dir) {struct rtrs_clt_con *con = req->con; -struct rtrs_clt_sess *sess =to_clt_sess (con->c.path); -struct rtrs_clt_stats *stats = sess->stats; +struct rtrs_clt_path *clt_path =to_clt_path (con->c.path); +struct rtrs_clt_stats *stats = clt_path->stats;unsigned int len; len = req->usr_len + req->data_len;
drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c +62 -61
277 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-clt.c +505 -488
2,257 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-clt.h +10 -10
@@ -124,7 +124,7 @@ struct rtrs_rbuf {u32 rkey; }; -struct rtrs_clt_sess { +struct rtrs_clt_path {struct rtrs_path s;struct rtrs_clt *clt;wait_queue_head_t state_wq;
@@ -156,7 +156,7 @@ struct rtrs_clt_sess {struct rtrs_clt {struct list_head paths_list;/* rcu protected list */ size_t paths_num; -struct rtrs_clt_sess +struct rtrs_clt_path __rcu *__percpu *pcpu_path;uuid_t paths_uuid;int paths_up;
@@ -186,9 +186,9 @@ static inline struct rtrs_clt_con *to_clt_con(struct rtrs_con *c) return container_of(c, struct rtrs_clt_con, c); } -static inline struct rtrs_clt_sess *to_clt_sess (struct rtrs_path *s) +static inline struct rtrs_clt_path *to_clt_path (struct rtrs_path *s) { - return container_of(s, struct rtrs_clt_sess, s); + return container_of(s, struct rtrs_clt_path, s); }static inline int permit_size (struct rtrs_clt *clt)
@@ -201,16 +201,16 @@ static inline struct rtrs_permit *get_permit(struct rtrs_clt *clt, int idx)return (struct rtrs_permit *)(clt->permits +permit_size (clt) * idx); } -int rtrs_clt_reconnect_from_sysfs (struct rtrs_clt_sess *sess); -void rtrs_clt_close_conns (struct rtrs_clt_sess *sess,bool wait); +int rtrs_clt_reconnect_from_sysfs (struct rtrs_clt_path *path); +void rtrs_clt_close_conns (struct rtrs_clt_path *clt_path,bool wait);int rtrs_clt_create_path_from_sysfs (struct rtrs_clt *clt,struct rtrs_addr *addr); -int rtrs_clt_remove_path_from_sysfs (struct rtrs_clt_sess *sess, +int rtrs_clt_remove_path_from_sysfs (struct rtrs_clt_path *path,const struct attribute *sysfs_self);void rtrs_clt_set_max_reconnect_attempts (struct rtrs_clt *clt,int value);int rtrs_clt_get_max_reconnect_attempts (const struct rtrs_clt *clt); -void free_sess (struct rtrs_clt_sess *sess); +void free_path (struct rtrs_clt_path *clt_path);/* rtrs-clt-stats.c */
@@ -242,8 +242,8 @@ ssize_t rtrs_clt_reset_all_help(struct rtrs_clt_stats *stats,int rtrs_clt_create_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, +int rtrs_clt_create_path_files (struct rtrs_clt_path *clt_path); +void rtrs_clt_destroy_path_files (struct rtrs_clt_path *clt_path,const struct attribute *sysfs_self);#endif /* RTRS_CLT_H */
drivers/infiniband/ulp/rtrs/rtrs.h +2 -2
@@ -53,13 +53,13 @@ struct rtrs_clt_ops { };struct rtrs_clt *rtrs_clt_open (struct rtrs_clt_ops *ops, -const char *sessname, +const char *pathname,const struct rtrs_addr *paths,size_t path_cnt,u16 port,size_t pdu_sz,u8 reconnect_delay_sec,s16 max_reconnect_attempts,u32 nr_poll_queues); -void rtrs_clt_close (struct rtrs_clt *sess); +void rtrs_clt_close (struct rtrs_clt *clt_path);enum wait_type {RTRS_PERMIT_NOWAIT =0 ,
Signature · 1 line
2.25.1
Re: [PATCHv2 for-next 3/5] RDMA/rtrs-clt: Rename rtrs_clt_sess to rtrs_clt_path
On 1/3/22 9:33 PM, Jack Wang wrote:
[ .. ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int post_recv_io(struct rtrs_clt_con *con, size_t q_size) · line 715
Quoted 2 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-static int post_recv_sess (struct rtrs_clt_sess *sess) +static int post_recv_path (struct rtrs_clt_path *clt_path)
How about rename it to post_recv_clt_path to make it obviously if you has the same change to post_recv_sess in rtrs-srv.c?
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int alloc_sess_reqs(struct rtrs_clt_sess *sess) · line 1392
Quoted 13 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3
-2@@ -1378,13 +1383,14 @@ static int alloc_sess_reqs(struct rtrs_clt_sess *sess)if (!req->sge) goto out; - req->mr =ib_alloc_mr (sess->s.dev->ib_pd,IB_MR_TYPE_MEM_REG , - sess->max_pages_per_mr); + req->mr =ib_alloc_mr (clt_path->s.dev->ib_pd, +IB_MR_TYPE_MEM_REG , + clt_path->max_pages_per_mr);if (IS_ERR (req->mr)) { err =PTR_ERR (req->mr); req->mr =NULL ; pr_err("Failed to alloc sess->max_pages_per_mr %d\n",
s/sess/clt_path/
Quoted 5 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1- sess->max_pages_per_mr); + clt_path->max_pages_per_mr); goto out; }
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static struct rtrs_clt_sess *alloc_sess(struct rtrs_clt *clt, · line 1601
Quoted 2 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-static int create_con (struct rtrs_clt_sess *sess,unsigned int cid) +static int create_con (struct rtrs_clt_path *clt_path,unsigned int cid)
Could you rename it to create_clt_con? Because the function name appears in both client and server.
Quoted 19 lines
{ struct rtrs_clt_con *con;drivers/infiniband/ulp/rtrs/rtrs-clt.c +2
-2@@ -1601,28 +1609,28 @@ static int create_con(struct rtrs_clt_sess *sess, unsigned int cid)/* Map first two connections to the first CPU */ con->cpu = (cid ? cid -1 :0 ) % nr_cpu_ids; con->c.cid = cid; - con->c.path = &sess->s; + con->c.path = &clt_path->s;/* Align with srv, init as 1 */ atomic_set (&con->c.wr_cnt,1 );mutex_init (&con->con_mutex); - sess->s.con[cid] = &con->c; + clt_path->s.con[cid] = &con->c;return 0 ; }
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static void rtrs_clt_stop_and_destroy_conns(struct rtrs_clt_sess *sess) · line 2212
Quoted 6 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3
-3-static inline bool xchg_sessions (struct rtrs_clt_sess __rcu **rcu_ppcpu_path, -struct rtrs_clt_sess *sess, -struct rtrs_clt_sess *next) +static inline bool xchg_sessions (struct rtrs_clt_path __rcu **rcu_ppcpu_path, +struct rtrs_clt_path *clt_path, +struct rtrs_clt_path *next)
Now, it is used to exchange paths instead of sessions, right?
Quoted 9 lines
{drivers/infiniband/ulp/rtrs/rtrs-clt.c +2
-2-struct rtrs_clt_sess **ppcpu_path; +struct rtrs_clt_path **ppcpu_path;/* Call cmpxchg() without sparse warnings */ ppcpu_path = (typeof (ppcpu_path ))rcu_ppcpu_path; -return sess ==cmpxchg (ppcpu_path, sess, next); +return clt_path ==cmpxchg (ppcpu_path, clt_path, next); }
[ ... ]
Quoted 5 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +0
-1@@ -2375,31 +2387,32 @@ static int init_conns(struct rtrs_clt_sess *sess)static void rtrs_clt_info_req_done (struct ib_cq *cq,struct ib_wc *wc) {struct rtrs_clt_con *con =to_clt_con (wc->qp->qp_context); -struct rtrs_clt_sess *sess =to_clt_sess (con->c.path);
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int init_conns(struct rtrs_clt_sess *sess) · line 2397
Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3
-2+struct rtrs_clt_path *clt_path =to_clt_path (con->c.path);struct rtrs_iu *iu; iu = container_of(wc->wr_cqe, struct rtrs_iu, cqe); -rtrs_iu_free (iu, sess->s.dev->ib_dev,1 ); +rtrs_iu_free (iu, clt_path->s.dev->ib_dev,1 );if (wc->status !=IB_WC_SUCCESS ) { - rtrs_err(sess->clt, "Sess info request send failed: %s\n", + rtrs_err(clt_path->clt, "*Sess* info request send failed: %s\n",
Path info, same as below.
[ ... ]
Quoted 14 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +2
-2if (wc->status !=IB_WC_SUCCESS ) { -rtrs_err (sess->clt,"Sess info response recv failed: %s\n" , +rtrs_err (clt_path->clt,"Path info response recv failed: %s\n" ,ib_wc_status_msg (wc->status)); goto out; }WARN_ON (wc->opcode !=IB_WC_RECV );if (wc->byte_len <sizeof (*msg)) { -rtrs_err (sess->clt,"Sess info response is malformed: size %d\n" , +rtrs_err (clt_path->clt,"Path info response is malformed: size %d\n" , wc->byte_len); goto out; }
[ ... ]
Quoted 4 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +0
-0@@ -2533,33 +2548,34 @@ static int rtrs_send_sess_info(struct rtrs_clt_sess *sess)/* Prepare for getting info response */ err =rtrs_iu_post_recv (&usr_con->c, rx_iu);if (err) {
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int rtrs_send_sess_info(struct rtrs_clt_sess *sess) · line 2558
Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +2
-2-rtrs_err (sess->clt,"rtrs_iu_post_recv(), err: %d\n" , err); +rtrs_err (clt_path->clt,"rtrs_iu_post_recv(), err: %d\n" , err); goto out; } rx_iu =NULL ; msg = tx_iu->buf; msg->type =cpu_to_le16 (RTRS_MSG_INFO_REQ ); -memcpy (msg->sessname, sess->s.sessname,sizeof (msg->sessname)); +memcpy (msg->sessname, clt_path->s.sessname,sizeof (msg->sessname));
Pls check if it is pathname.
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int rtrs_send_sess_info(struct rtrs_clt_sess *sess) · line 2598
Quoted 4 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-2/** -* init_sess() - establishes all session connections and does handshake -* @sess: client session. +* init_pathi() - establishes all path connections and does handshake
s/init_pathi/init_path, maybe it would be better to call it init_clt_path here.
Quoted 6 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +2
-1+* @clt_path: client path. * In case of error full close or reconnect procedure should be taken, * because reconnect or close async works can be started. */ -static int init_sess (struct rtrs_clt_sess *sess) +static int init_path (struct rtrs_clt_path *clt_path)
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int rtrs_send_sess_info(struct rtrs_clt_sess *sess)
Quoted 3 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-if (sess->reconnect_attempts >= clt->max_reconnect_attempts) { +if (clt_path->reconnect_attempts >= clt->max_reconnect_attempts) {/* Close a*session* completely if max attempts is reached */
I guess it is close a path now.
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int rtrs_send_sess_info(struct rtrs_clt_sess *sess) · line 2654
Quoted 4 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-rtrs_clt_close_conns (sess, false); +rtrs_clt_close_conns (clt_path, false);return ; }
[ ... ]
Thanks,
Guoqing
Re: [PATCHv2 for-next 3/5] RDMA/rtrs-clt: Rename rtrs_clt_sess to rtrs_clt_path
Quoted 2 lines · Guoqing Jiang
Thanks for the reviews, Guoqing.
Quoted 16 lines · Jack Wang
[ .. ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int post_recv_io(struct rtrs_clt_con *con, size_t q_size) · line 715
Quoted 2 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-static int post_recv_sess (struct rtrs_clt_sess *sess) +static int post_recv_path (struct rtrs_clt_path *clt_path)How about rename it to
post_recv_clt_pathto make it obviously if you has the same change topost_recv_sessinrtrs-srv.c?[ ... ]
Quoted 4 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +0
-0@@ -1378,13 +1383,14 @@ static int alloc_sess_reqs(struct rtrs_clt_sess *sess)if (!req->sge) goto out;
Quoted 11 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int alloc_sess_reqs(struct rtrs_clt_sess *sess) · line 1392
Quoted 9 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3
-2- req->mr =ib_alloc_mr (sess->s.dev->ib_pd,IB_MR_TYPE_MEM_REG , - sess->max_pages_per_mr); + req->mr =ib_alloc_mr (clt_path->s.dev->ib_pd, +IB_MR_TYPE_MEM_REG , + clt_path->max_pages_per_mr);if (IS_ERR (req->mr)) { err =PTR_ERR (req->mr); req->mr =NULL ; pr_err("Failed to alloc sess->max_pages_per_mr %d\n",s/sess/clt_path/
Good catch.
Quoted 6 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int alloc_sess_reqs(struct rtrs_clt_sess *sess) · line 1396
Quoted 5 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1- sess->max_pages_per_mr); + clt_path->max_pages_per_mr); goto out; }
Quoted 7 lines
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static struct rtrs_clt_sess *alloc_sess(struct rtrs_clt *clt, · line 1601
Quoted 2 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-static int create_con (struct rtrs_clt_sess *sess,unsigned int cid) +static int create_con (struct rtrs_clt_path *clt_path,unsigned int cid)Could you rename it to
create_clt_con? Because the function name appears in both client and server.
I think renaming the functions with the same name on client and server side should be a seperate patch/series as these patches are only for fixing the incorrect naming.
Quoted 90 lines
Quoted 19 lines
{ struct rtrs_clt_con *con;drivers/infiniband/ulp/rtrs/rtrs-clt.c +2
-2@@ -1601,28 +1609,28 @@ static int create_con(struct rtrs_clt_sess *sess, unsigned int cid)/* Map first two connections to the first CPU */ con->cpu = (cid ? cid -1 :0 ) % nr_cpu_ids; con->c.cid = cid; - con->c.path = &sess->s; + con->c.path = &clt_path->s;/* Align with srv, init as 1 */ atomic_set (&con->c.wr_cnt,1 );mutex_init (&con->con_mutex); - sess->s.con[cid] = &con->c; + clt_path->s.con[cid] = &con->c;return 0 ; }[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static void rtrs_clt_stop_and_destroy_conns(struct rtrs_clt_sess *sess) · line 2212
Quoted 6 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3
-3-static inline bool xchg_sessions (struct rtrs_clt_sess __rcu **rcu_ppcpu_path, -struct rtrs_clt_sess *sess, -struct rtrs_clt_sess *next) +static inline bool xchg_sessions (struct rtrs_clt_path __rcu **rcu_ppcpu_path, +struct rtrs_clt_path *clt_path, +struct rtrs_clt_path *next)Now, it is used to exchange paths instead of sessions, right?
Quoted 9 lines
{drivers/infiniband/ulp/rtrs/rtrs-clt.c +2
-2-struct rtrs_clt_sess **ppcpu_path; +struct rtrs_clt_path **ppcpu_path;/* Call cmpxchg() without sparse warnings */ ppcpu_path = (typeof (ppcpu_path ))rcu_ppcpu_path; -return sess ==cmpxchg (ppcpu_path, sess, next); +return clt_path ==cmpxchg (ppcpu_path, clt_path, next); }[ ... ]
Quoted 5 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +0
-1@@ -2375,31 +2387,32 @@ static int init_conns(struct rtrs_clt_sess *sess)static void rtrs_clt_info_req_done (struct ib_cq *cq,struct ib_wc *wc) {struct rtrs_clt_con *con =to_clt_con (wc->qp->qp_context); -struct rtrs_clt_sess *sess =to_clt_sess (con->c.path);drivers/infiniband/ulp/rtrs/rtrs-clt.c static int init_conns(struct rtrs_clt_sess *sess) · line 2397
Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3
-2+struct rtrs_clt_path *clt_path =to_clt_path (con->c.path);struct rtrs_iu *iu; iu = container_of(wc->wr_cqe, struct rtrs_iu, cqe); -rtrs_iu_free (iu, sess->s.dev->ib_dev,1 ); +rtrs_iu_free (iu, clt_path->s.dev->ib_dev,1 );if (wc->status !=IB_WC_SUCCESS ) { - rtrs_err(sess->clt, "Sess info request send failed: %s\n", + rtrs_err(clt_path->clt, "*Sess* info request send failed: %s\n",Path info, same as below.
[ ... ]
Quoted 14 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +2
-2if (wc->status !=IB_WC_SUCCESS ) { -rtrs_err (sess->clt,"Sess info response recv failed: %s\n" , +rtrs_err (clt_path->clt,"Path info response recv failed: %s\n" ,ib_wc_status_msg (wc->status)); goto out; }WARN_ON (wc->opcode !=IB_WC_RECV );if (wc->byte_len <sizeof (*msg)) { -rtrs_err (sess->clt,"Sess info response is malformed: size %d\n" , +rtrs_err (clt_path->clt,"Path info response is malformed: size %d\n" , wc->byte_len); goto out; }[ ... ]
Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1@@ -2533,33 +2548,34 @@ static int rtrs_send_sess_info(struct rtrs_clt_sess *sess)/* Prepare for getting info response */ err =rtrs_iu_post_recv (&usr_con->c, rx_iu);if (err) { -rtrs_err (sess->clt,"rtrs_iu_post_recv(), err: %d\n" , err); +rtrs_err (clt_path->clt,"rtrs_iu_post_recv(), err: %d\n" , err); goto out; } rx_iu =NULL ;
Quoted 6 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int rtrs_send_sess_info(struct rtrs_clt_sess *sess) · line 2558
Quoted 4 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1msg = tx_iu->buf; msg->type =cpu_to_le16 (RTRS_MSG_INFO_REQ ); -memcpy (msg->sessname, sess->s.sessname,sizeof (msg->sessname)); +memcpy (msg->sessname, clt_path->s.sessname,sizeof (msg->sessname));Pls check if it is pathname.
Will do. Actually sessname is correctly named at a bunch of places so didn't require renaming. But I'll double check again.
Thanks for all other comments. Will address them in the next version of a patchset.
Quoted 35 lines
[ ... ]
Quoted 4 lines
/**
- *init_sess()- establishes all session connections and does handshake
- * @sess: client session.
+ *init_pathi()- establishes all path connections and does handshakes/init_pathi/init_path, maybe it would be better to call it
init_clt_pathhere.Quoted 6 lines
+ * @clt_path: client path.
* In case of error full close or reconnect procedure should be taken,
* because reconnect or close async works can be started. */drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-static int init_sess (struct rtrs_clt_sess *sess) +static int init_path (struct rtrs_clt_path *clt_path)[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int rtrs_send_sess_info(struct rtrs_clt_sess *sess)
Quoted 3 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-if (sess->reconnect_attempts >= clt->max_reconnect_attempts) { +if (clt_path->reconnect_attempts >= clt->max_reconnect_attempts) {/* Close a*session* completely if max attempts is reached */ I guess it is close a path now.
drivers/infiniband/ulp/rtrs/rtrs-clt.c static int rtrs_send_sess_info(struct rtrs_clt_sess *sess) · line 2654
Quoted 4 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1
-1-rtrs_clt_close_conns (sess, false); +rtrs_clt_close_conns (clt_path, false);return ; }[ ... ]
Thanks,
Guoqing
Jack Wang
maintainerPATCH v2 4/5 RDMA/rtrs-srv: Rename rtrs_srv to rtrs_srv_sess
In reply to Jack WangFrom: Vaishali Thakkar <[email protected]>
Structure rtrs_srv is used for sessions so in order to avoid confusions rename it to rtrs_srv_sess.
All changes were done with the help of following
Coccinelle script:
@@
@@
struct
- rtrs_srv
+ rtrs_srv_sess
--- drivers/block/rnbd/rnbd-srv.c | 4 +- drivers/block/rnbd/rnbd-srv.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 6 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 60 ++++++++++---------- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 4 +- drivers/infiniband/ulp/rtrs/rtrs.h | 11 ++-- 6 files changed, 45 insertions(+), 42 deletions(-)
drivers/block/rnbd/rnbd-srv.c +2 -2
@@ -263,7 +263,7 @@ static void destroy_sess(struct rnbd_srv_session *srv_sess)kfree (srv_sess); } -static int create_sess (struct rtrs_srv *rtrs) +static int create_sess (struct rtrs_srv_sess *rtrs) {struct rnbd_srv_session *srv_sess;char sessname[NAME_MAX ];
@@ -305,7 +305,7 @@ static int create_sess(struct rtrs_srv *rtrs)return 0 ; } -static int rnbd_srv_link_ev (struct rtrs_srv *rtrs, +static int rnbd_srv_link_ev (struct rtrs_srv_sess *rtrs,enum rtrs_srv_link_ev ev,void *priv) {struct rnbd_srv_session *srv_sess = priv;
drivers/block/rnbd/rnbd-srv.h +1 -1
@@ -20,7 +20,7 @@struct rnbd_srv_session {/* Entry inside global sess_list */ struct list_head list; -struct rtrs_srv *rtrs; +struct rtrs_srv_sess *rtrs;char sessname[NAME_MAX ];int queue_depth;struct bio_set sess_bio_set;
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +3 -3
@@ -154,7 +154,7 @@ static const struct attribute_group rtrs_srv_stats_attr_group = {static int rtrs_srv_create_once_sysfs_root_folders (struct rtrs_srv_path *srv_path) { -struct rtrs_srv *srv = srv_path->srv; +struct rtrs_srv_sess *srv = srv_path->srv;int err =0 ;mutex_lock (&srv->paths_mutex);
@@ -199,7 +199,7 @@ static int rtrs_srv_create_once_sysfs_root_folders(struct rtrs_srv_path *srv_patstatic void rtrs_srv_destroy_once_sysfs_root_folders (struct rtrs_srv_path *srv_path) { -struct rtrs_srv *srv = srv_path->srv; +struct rtrs_srv_sess *srv = srv_path->srv;mutex_lock (&srv->paths_mutex);if (!--srv->dev_ref) {
@@ -258,7 +258,7 @@ static int rtrs_srv_create_stats_files(struct rtrs_srv_path *srv_path)int rtrs_srv_create_path_files (struct rtrs_srv_path *srv_path) { -struct rtrs_srv *srv = srv_path->srv; +struct rtrs_srv_sess *srv = srv_path->srv;struct rtrs_path *s = &srv_path->s;char str[NAME_MAX ];int err;
drivers/infiniband/ulp/rtrs/rtrs-srv.c +31 -29
229 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-srv.h +2 -2
@@ -73,7 +73,7 @@ struct rtrs_srv_mr {struct rtrs_srv_path {struct rtrs_path s; -struct rtrs_srv *srv; +struct rtrs_srv_sess *srv;struct work_struct close_work;enum rtrs_srv_state state;spinlock_t state_lock;
@@ -90,7 +90,7 @@ struct rtrs_srv_path {struct rtrs_srv_stats *stats; }; -struct rtrs_srv { +struct rtrs_srv_sess {struct list_head paths_list;int paths_up;struct mutex paths_ev_mutex;
drivers/infiniband/ulp/rtrs/rtrs.h +6 -5
@@ -15,7 +15,7 @@struct rtrs_permit ;struct rtrs_clt ;struct rtrs_srv_ctx ; -struct rtrs_srv ; +struct rtrs_srv_sess ;struct rtrs_srv_op ;/*
@@ -163,7 +163,7 @@ struct rtrs_srv_ops {* @priv: Private data from user if previously set with * rtrs_srv_set_sess_priv() */ -int (*link_ev)(struct rtrs_srv *sess,enum rtrs_srv_link_ev ev, +int (*link_ev)(struct rtrs_srv_sess *sess,enum rtrs_srv_link_ev ev,void *priv); };
@@ -173,11 +173,12 @@ void rtrs_srv_close(struct rtrs_srv_ctx *ctx);bool rtrs_srv_resp_rdma (struct rtrs_srv_op *id,int errno); -void rtrs_srv_set_sess_priv (struct rtrs_srv *sess,void *priv); +void rtrs_srv_set_sess_priv (struct rtrs_srv_sess *sess,void *priv); -int rtrs_srv_get_path_name (struct rtrs_srv *sess,char *sessname,size_t len); +int rtrs_srv_get_path_name (struct rtrs_srv_sess *sess,char *sessname, +size_t len); -int rtrs_srv_get_queue_depth (struct rtrs_srv *sess); +int rtrs_srv_get_queue_depth (struct rtrs_srv_sess *sess);int rtrs_addr_to_sockaddr (const char *str,size_t len,u16 port,struct rtrs_addr *addr);
Signature · 1 line
2.25.1
Re: [PATCHv2 for-next 4/5] RDMA/rtrs-srv: Rename rtrs_srv to rtrs_srv_sess
drivers/block/rnbd/rnbd-srv.h line 23
Quoted 10 lines · Jack Wang
drivers/block/rnbd/rnbd-srv.h +1
-1@@ -20,7 +20,7 @@struct rnbd_srv_session {/* Entry inside global sess_list */ struct list_head list; -struct rtrs_srv *rtrs; +struct rtrs_srv_sess *rtrs;
How about change it to srv_sess?
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c static const struct attribute_group rtrs_srv_stats_attr_group = { · line 157
Quoted 13 lines
drivers/block/rnbd/rnbd-srv.h +0
-0char sessname[NAME_MAX ];int queue_depth;struct bio_set sess_bio_set;drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +1
-1@@ -154,7 +154,7 @@ static const struct attribute_group rtrs_srv_stats_attr_group = {static int rtrs_srv_create_once_sysfs_root_folders (struct rtrs_srv_path *srv_path) { -struct rtrs_srv *srv = srv_path->srv; +struct rtrs_srv_sess *srv = srv_path->srv;
It is srv here, maybe srv_sess too, FYI.
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-srv.h struct rtrs_srv_mr { · line 76
Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-srv.h +1
-1@@ -73,7 +73,7 @@ struct rtrs_srv_mr {struct rtrs_srv_path {struct rtrs_path s; -struct rtrs_srv *srv; +struct rtrs_srv_sess *srv;
Ditto.
Thanks,
Guoqing
Re: [PATCHv2 for-next 4/5] RDMA/rtrs-srv: Rename rtrs_srv to rtrs_srv_sess
Quoted 4 lines · Guoqing Jiang
On 1/3/22 9:33 PM, Jack Wang wrote:
Quoted 12 lines
drivers/block/rnbd/rnbd-srv.h line 23
Quoted 10 lines
drivers/block/rnbd/rnbd-srv.h +1
-1@@ -20,7 +20,7 @@struct rnbd_srv_session {/* Entry inside global sess_list */ struct list_head list; -struct rtrs_srv *rtrs; +struct rtrs_srv_sess *rtrs;How about change it to
srv_sess?
I've kept the variable names as it is if it didn't include incorrect naming. e.g. naming path variables with sess/session. Struct names in the last 2 patches are changed just to make a clear distinction. Doing variable name changes will probably require a lot more changes in the files and I'm not sure if it's worth the effort.
Quoted 33 lines
drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c static const struct attribute_group rtrs_srv_stats_attr_group = { · line 157
Quoted 13 lines
drivers/block/rnbd/rnbd-srv.h +0
-0char sessname[NAME_MAX ];int queue_depth;struct bio_set sess_bio_set;drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c +1
-1@@ -154,7 +154,7 @@ static const struct attribute_group rtrs_srv_stats_attr_group = {static int rtrs_srv_create_once_sysfs_root_folders (struct rtrs_srv_path *srv_path) { -struct rtrs_srv *srv = srv_path->srv; +struct rtrs_srv_sess *srv = srv_path->srv;It is srv here, maybe
srv_sesstoo, FYI.[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-srv.h struct rtrs_srv_mr { · line 76
Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-srv.h +1
-1@@ -73,7 +73,7 @@ struct rtrs_srv_mr {struct rtrs_srv_path {struct rtrs_path s; -struct rtrs_srv *srv; +struct rtrs_srv_sess *srv;Ditto.
Thanks,
Guoqing
Jack Wang
maintainerPATCH v2 5/5 RDMA/rtrs-clt: Rename rtrs_clt to rtrs_clt_sess
In reply to Jack WangFrom: Vaishali Thakkar <[email protected]>
Structure rtrs_clt is used for sessions. So to
avoid confusions rename it to rtrs_clt_sess.
Transformations are done with the help of
following coccinelle script.
@@
@@
struct
- rtrs_clt
+ rtrs_clt_sess
--- drivers/block/rnbd/rnbd-clt.c | 4 +- drivers/block/rnbd/rnbd-clt.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 24 +++--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 78 ++++++++++---------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 19 ++--- drivers/infiniband/ulp/rtrs/rtrs.h | 21 +++--- 6 files changed, 77 insertions(+), 71 deletions(-)
drivers/block/rnbd/rnbd-clt.c +2 -2
@@ -433,7 +433,7 @@ static void msg_conf(void *priv, int errno)schedule_work (&iu->work); } -static int send_usr_msg(struct rtrs_clt *rtrs, int dir, +static int send_usr_msg(struct rtrs_clt_sess *rtrs, int dir, struct rnbd_iu *iu, struct kvec *vec, size_t len, struct scatterlist *sg, unsigned int sg_len, void (*conf)(struct work_struct *work),
@@ -1010,7 +1010,7 @@ static int rnbd_client_xfer_request(struct rnbd_clt_dev *dev,struct request *rq, struct rnbd_iu *iu) { - struct rtrs_clt *rtrs = dev->sess->rtrs; + struct rtrs_clt_sess *rtrs = dev->sess->rtrs;struct rtrs_permit *permit = iu->permit;struct rnbd_msg_io msg;struct rtrs_clt_req_ops req_ops;
drivers/block/rnbd/rnbd-clt.h +1 -1
@@ -75,7 +75,7 @@ struct rnbd_cpu_qlist {struct rnbd_clt_session {struct list_head list; -struct rtrs_clt *rtrs; +struct rtrs_clt_sess *rtrs;wait_queue_head_t rtrs_waitq;bool rtrs_ready;struct rnbd_cpu_qlist __percpu
drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c +13 -11
@@ -50,7 +50,8 @@ static ssize_t max_reconnect_attempts_show(struct device *dev,struct device_attribute *attr, char *page) { - struct rtrs_clt *clt = container_of(dev, struct rtrs_clt, dev); + struct rtrs_clt_sess *clt = container_of(dev, struct rtrs_clt_sess, + dev);return sysfs_emit (page,"%d\n" ,rtrs_clt_get_max_reconnect_attempts (clt));
@@ -63,7 +64,8 @@ static ssize_t max_reconnect_attempts_store(struct device *dev, {int value;int ret; - struct rtrs_clt *clt = container_of(dev, struct rtrs_clt, dev); + struct rtrs_clt_sess *clt = container_of(dev, struct rtrs_clt_sess, + dev); ret =kstrtoint (buf,10 , &value);if (ret) {
@@ -90,9 +92,9 @@ static ssize_t mpath_policy_show(struct device *dev,struct device_attribute *attr, char *page) { - struct rtrs_clt *clt; + struct rtrs_clt_sess *clt; - clt = container_of(dev, struct rtrs_clt, dev); + clt = container_of(dev, struct rtrs_clt_sess, dev);switch (clt->mp_policy) {case MP_POLICY_RR :
@@ -114,12 +116,12 @@ static ssize_t mpath_policy_store(struct device *dev, const char *buf, size_t count) { -struct rtrs_clt *clt; +struct rtrs_clt_sess *clt;int value;int ret;size_t len =0 ; - clt = container_of(dev, struct rtrs_clt, dev); + clt = container_of(dev, struct rtrs_clt_sess, dev); ret =kstrtoint (buf,10 , &value); if (!ret && (value == MP_POLICY_RR ||
@@ -169,12 +171,12 @@ static ssize_t add_path_store(struct device *dev, .src = &srcaddr, .dst = &dstaddr }; -struct rtrs_clt *clt; +struct rtrs_clt_sess *clt;const char *nl;size_t len;int err; - clt = container_of(dev, struct rtrs_clt, dev); + clt = container_of(dev, struct rtrs_clt_sess, dev); nl =strchr (buf,'\n' );if (nl)
@@ -425,7 +427,7 @@ static const struct attribute_group rtrs_clt_path_attr_group = {int rtrs_clt_create_path_files (struct rtrs_clt_path *clt_path) { -struct rtrs_clt *clt = clt_path->clt; +struct rtrs_clt_sess *clt = clt_path->clt;char str[NAME_MAX ];int err;struct rtrs_addr path = {
@@ -497,12 +499,12 @@ static const struct attribute_group rtrs_clt_attr_group = { .attrs = rtrs_clt_attrs, }; -int rtrs_clt_create_sysfs_root_files (struct rtrs_clt *clt) +int rtrs_clt_create_sysfs_root_files (struct rtrs_clt_sess *clt) {return sysfs_create_group (&clt->dev.kobj, &rtrs_clt_attr_group); } -void rtrs_clt_destroy_sysfs_root (struct rtrs_clt *clt) +void rtrs_clt_destroy_sysfs_root (struct rtrs_clt_sess *clt) {sysfs_remove_group (&clt->dev.kobj, &rtrs_clt_attr_group);
drivers/infiniband/ulp/rtrs/rtrs-clt.c +40 -38
290 lines not on this page · raw message
drivers/infiniband/ulp/rtrs/rtrs-clt.h +10 -9
@@ -126,7 +126,7 @@ struct rtrs_rbuf {struct rtrs_clt_path {struct rtrs_path s; -struct rtrs_clt *clt; +struct rtrs_clt_sess *clt;wait_queue_head_t state_wq;enum rtrs_clt_state state;atomic_t connected_cnt;
@@ -153,7 +153,7 @@ struct rtrs_clt_path { *mp_skip_entry; }; -struct rtrs_clt { +struct rtrs_clt_sess {struct list_head paths_list;/* rcu protected list */ size_t paths_num;struct rtrs_clt_path
@@ -191,25 +191,26 @@ static inline struct rtrs_clt_path *to_clt_path(struct rtrs_path *s) return container_of(s, struct rtrs_clt_path, s); } -static inline int permit_size (struct rtrs_clt *clt) +static inline int permit_size (struct rtrs_clt_sess *clt) {return sizeof (struct rtrs_permit ) + clt->pdu_sz; } -static inline struct rtrs_permit *get_permit (struct rtrs_clt *clt,int idx) +static inline struct rtrs_permit *get_permit (struct rtrs_clt_sess *clt, +int idx) {return (struct rtrs_permit *)(clt->permits +permit_size (clt) * idx); }int rtrs_clt_reconnect_from_sysfs (struct rtrs_clt_path *path);void rtrs_clt_close_conns (struct rtrs_clt_path *clt_path,bool wait); -int rtrs_clt_create_path_from_sysfs (struct rtrs_clt *clt, +int rtrs_clt_create_path_from_sysfs (struct rtrs_clt_sess *clt,struct rtrs_addr *addr);int rtrs_clt_remove_path_from_sysfs (struct rtrs_clt_path *path,const struct attribute *sysfs_self); -void rtrs_clt_set_max_reconnect_attempts (struct rtrs_clt *clt,int value); -int rtrs_clt_get_max_reconnect_attempts (const struct rtrs_clt *clt); +void rtrs_clt_set_max_reconnect_attempts (struct rtrs_clt_sess *clt,int value); +int rtrs_clt_get_max_reconnect_attempts (const struct rtrs_clt_sess *clt);void free_path (struct rtrs_clt_path *clt_path);/* rtrs-clt-stats.c */
@@ -239,8 +240,8 @@ 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 (struct rtrs_clt *clt); +int rtrs_clt_create_sysfs_root_files (struct rtrs_clt_sess *clt); +void rtrs_clt_destroy_sysfs_root (struct rtrs_clt_sess *clt);int rtrs_clt_create_path_files (struct rtrs_clt_path *clt_path); void rtrs_clt_destroy_path_files(struct rtrs_clt_path *clt_path,
drivers/infiniband/ulp/rtrs/rtrs.h +11 -10
@@ -13,7 +13,7 @@#include <linux/scatterlist.h> struct rtrs_permit ; -struct rtrs_clt ; +struct rtrs_clt_sess ;struct rtrs_srv_ctx ;struct rtrs_srv_sess ;struct rtrs_srv_op ;
@@ -52,14 +52,14 @@ struct rtrs_clt_ops {void (*link_ev)(void *priv,enum rtrs_clt_link_ev ev); }; -struct rtrs_clt *rtrs_clt_open (struct rtrs_clt_ops *ops, +struct rtrs_clt_sess *rtrs_clt_open (struct rtrs_clt_ops *ops,const char *pathname,const struct rtrs_addr *paths,size_t path_cnt,u16 port,size_t pdu_sz,u8 reconnect_delay_sec,s16 max_reconnect_attempts,u32 nr_poll_queues); -void rtrs_clt_close (struct rtrs_clt *clt_path); +void rtrs_clt_close (struct rtrs_clt_sess *clt_path);enum wait_type {RTRS_PERMIT_NOWAIT =0 ,
@@ -77,11 +77,12 @@ enum rtrs_clt_con_type { RTRS_IO_CON }; -struct rtrs_permit *rtrs_clt_get_permit (struct rtrs_clt *sess, -enum rtrs_clt_con_type con_type, -enum wait_type wait); +struct rtrs_permit *rtrs_clt_get_permit (struct rtrs_clt_sess *sess, +enum rtrs_clt_con_type con_type, +enum wait_type wait); -void rtrs_clt_put_permit (struct rtrs_clt *sess,struct rtrs_permit *permit); +void rtrs_clt_put_permit (struct rtrs_clt_sess *sess, +struct rtrs_permit *permit);/** * rtrs_clt_req_ops - it holds the request confirmation callback
@@ -98,10 +99,10 @@ struct rtrs_clt_req_ops { };int rtrs_clt_request (int dir,struct rtrs_clt_req_ops *ops, -struct rtrs_clt *sess,struct rtrs_permit *permit, +struct rtrs_clt_sess *sess,struct rtrs_permit *permit,const struct kvec *vec,size_t nr,size_t len,struct scatterlist *sg,unsigned int sg_cnt); -int rtrs_clt_rdma_cq_direct (struct rtrs_clt *clt,unsigned int index); +int rtrs_clt_rdma_cq_direct (struct rtrs_clt_sess *clt,unsigned int index);/** * rtrs_attrs - RTRS session attributes
@@ -112,7 +113,7 @@ struct rtrs_attrs {u32 max_segments; }; -int rtrs_clt_query (struct rtrs_clt *sess,struct rtrs_attrs *attr); +int rtrs_clt_query (struct rtrs_clt_sess *sess,struct rtrs_attrs *attr);/* * Here goes RTRS server API
Signature · 1 line
2.25.1
Re: [PATCHv2 for-next 5/5] RDMA/rtrs-clt: Rename rtrs_clt to rtrs_clt_sess
Quoted 52 lines · Jack Wang
From: Vaishali Thakkar<[email protected]>
Structure
rtrs_cltis used for sessions. So to
avoid confusions rename it tortrs_clt_sess.Transformations are done with the help of
following coccinelle script.@@
@@
struct
-rtrs_clt
+rtrs_clt_sessSigned-off-by Vaishali Thakkar<[email protected]>Signed-off-by Jack Wang<[email protected]>--- drivers/block/rnbd/rnbd-clt.c | 4 +- drivers/block/rnbd/rnbd-clt.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 24 +++--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 78 ++++++++++---------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 19 ++--- drivers/infiniband/ulp/rtrs/rtrs.h | 21 +++--- 6 files changed, 77 insertions(+), 71 deletions(-)drivers/block/rnbd/rnbd-clt.c +2
-2@@ -433,7 +433,7 @@ static void msg_conf(void *priv, int errno)schedule_work (&iu->work); } -static int send_usr_msg(struct rtrs_clt *rtrs, int dir, +static int send_usr_msg(struct rtrs_clt_sess *rtrs, int dir, struct rnbd_iu *iu, struct kvec *vec, size_t len, struct scatterlist *sg, unsigned int sg_len, void (*conf)(struct work_struct *work),@@ -1010,7 +1010,7 @@ static int rnbd_client_xfer_request(struct rnbd_clt_dev *dev,struct request *rq, struct rnbd_iu *iu) { - struct rtrs_clt *rtrs = dev->sess->rtrs; + struct rtrs_clt_sess *rtrs = dev->sess->rtrs;struct rtrs_permit *permit = iu->permit;struct rnbd_msg_io msg;struct rtrs_clt_req_ops req_ops;drivers/block/rnbd/rnbd-clt.h +0
-0
drivers/block/rnbd/rnbd-clt.h struct rnbd_cpu_qlist { · line 78
Quoted 5 lines
drivers/block/rnbd/rnbd-clt.h +1
-1@@ -75,7 +75,7 @@ struct rnbd_cpu_qlist {struct rnbd_clt_session {struct list_head list; -struct rtrs_clt *rtrs; +struct rtrs_clt_sess *rtrs;
While at it, how about change it to clt_sess? Otherwise there is symbol name pollution between rnbd_clt_session and rnbd_srv_session.
[ ...]
drivers/block/rnbd/rnbd-clt.h static int post_recv_path(struct rtrs_clt_path *clt_path) · line 747
Quoted 7 lines
drivers/block/rnbd/rnbd-clt.h +1
-1/* @@ -743,7 +744,7 @@ static int post_recv_path(struct rtrs_clt_path *clt_path)struct path_it {int i;struct list_head skip_list; -struct rtrs_clt *clt; +struct rtrs_clt_sess *clt;
To align with the change of type, s/clt/clt_sess? If so, it applies to others as well.
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.h struct rtrs_rbuf { · line 129
Quoted 8 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.h +1
-1@@ -126,7 +126,7 @@ struct rtrs_rbuf {struct rtrs_clt_path {struct rtrs_path s; -struct rtrs_clt *clt; + struct rtrs_clt_sess **clt*;
Ditto.
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.h
Quoted 10 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.h +1
-1-struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops, +struct rtrs_clt_sess *rtrs_clt_open(struct rtrs_clt_ops *ops, const char *pathname, const struct rtrs_addr *paths,
size_tpath_cnt, u16 port,
size_tpdu_sz, u8reconnect_delay_sec, s16max_reconnect_attempts, u32nr_poll_queues);drivers/infiniband/ulp/rtrs/rtrs-clt.h +1
-1-void rtrs_clt_close (struct rtrs_clt *clt_path); +void rtrs_clt_close (struct rtrs_clt_sess *clt_path);
void rtrs_clt_close(struct rtrs_clt_sess *clt_sess);
or
void rtrs_clt_close(struct rtrs_clt_path *clt_path);
Maybe rename those functions to rtrs_clt_session_{open,close} to resolve the ambiguous completely, or we can live with current name I am not sure.
BTW, I suppose the series deserve beer from Danil 😉
Thanks,
Guoqing
Re: [PATCHv2 for-next 5/5] RDMA/rtrs-clt: Rename rtrs_clt to rtrs_clt_sess
Quoted 101 lines · Guoqing Jiang
Quoted 52 lines · Jack Wang
From: Vaishali Thakkar<[email protected]>
Structure
rtrs_cltis used for sessions. So to
avoid confusions rename it tortrs_clt_sess.Transformations are done with the help of
following coccinelle script.@@
@@
struct
-rtrs_clt
+rtrs_clt_sessSigned-off-by Vaishali Thakkar<[email protected]>Signed-off-by Jack Wang<[email protected]>--- drivers/block/rnbd/rnbd-clt.c | 4 +- drivers/block/rnbd/rnbd-clt.h | 2 +- drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 24 +++--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 78 ++++++++++---------- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 19 ++--- drivers/infiniband/ulp/rtrs/rtrs.h | 21 +++--- 6 files changed, 77 insertions(+), 71 deletions(-)drivers/block/rnbd/rnbd-clt.c +2
-2@@ -433,7 +433,7 @@ static void msg_conf(void *priv, int errno)schedule_work (&iu->work); } -static int send_usr_msg(struct rtrs_clt *rtrs, int dir, +static int send_usr_msg(struct rtrs_clt_sess *rtrs, int dir, struct rnbd_iu *iu, struct kvec *vec, size_t len, struct scatterlist *sg, unsigned int sg_len, void (*conf)(struct work_struct *work),@@ -1010,7 +1010,7 @@ static int rnbd_client_xfer_request(struct rnbd_clt_dev *dev,struct request *rq, struct rnbd_iu *iu) { - struct rtrs_clt *rtrs = dev->sess->rtrs; + struct rtrs_clt_sess *rtrs = dev->sess->rtrs;struct rtrs_permit *permit = iu->permit;struct rnbd_msg_io msg;struct rtrs_clt_req_ops req_ops;drivers/block/rnbd/rnbd-clt.h +0
-0drivers/block/rnbd/rnbd-clt.h struct rnbd_cpu_qlist { · line 78
Quoted 5 lines
drivers/block/rnbd/rnbd-clt.h +1
-1@@ -75,7 +75,7 @@ struct rnbd_cpu_qlist {struct rnbd_clt_session {struct list_head list; -struct rtrs_clt *rtrs; +struct rtrs_clt_sess *rtrs;While at it, how about change it to
clt_sess? Otherwise there is symbol name pollution betweenrnbd_clt_sessionandrnbd_srv_session.[ ...]
drivers/block/rnbd/rnbd-clt.h static int post_recv_path(struct rtrs_clt_path *clt_path) · line 747
Quoted 7 lines
drivers/block/rnbd/rnbd-clt.h +1
-1/* @@ -743,7 +744,7 @@ static int post_recv_path(struct rtrs_clt_path *clt_path)struct path_it {int i;struct list_head skip_list; -struct rtrs_clt *clt; +struct rtrs_clt_sess *clt;To align with the change of type, s/clt/clt_sess? If so, it applies to others as well.
[ ... ]
drivers/infiniband/ulp/rtrs/rtrs-clt.h struct rtrs_rbuf { · line 129
Quoted 8 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.h +1
-1@@ -126,7 +126,7 @@ struct rtrs_rbuf {struct rtrs_clt_path {struct rtrs_path s; -struct rtrs_clt *clt; + struct rtrs_clt_sess **clt*;Ditto.
[ ... ]
Quoted 8 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.h +1
-1-struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops, +struct rtrs_clt_sess *rtrs_clt_open(struct rtrs_clt_ops *ops, const char *pathname, const struct rtrs_addr *paths,
size_tpath_cnt, u16 port,
size_tpdu_sz, u8reconnect_delay_sec, s16max_reconnect_attempts, u32nr_poll_queues);
Quoted 8 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.h
Quoted 2 lines
drivers/infiniband/ulp/rtrs/rtrs-clt.h +1
-1-void rtrs_clt_close (struct rtrs_clt *clt_path); +void rtrs_clt_close (struct rtrs_clt_sess *clt_path);void
rtrs_clt_close(struct rtrs_clt_sess *clt_sess);or
void
rtrs_clt_close(struct rtrs_clt_path *clt_path);
Good catch. Actually this should be
void rtrs_clt_close(struct rtrs_clt_sess *clt);
Quoted 4 lines
Maybe rename those functions to rtrs_clt_session_{open,close} to resolve the ambiguous
completely, or we can live with current name I am not sure.
For this series, I think we can live with the current name. :)
Quoted 1 line
BTW, I suppose the series deserve beer from Danil 😉
:)
Quoted 3 lines
Thanks,
Guoqing