Skip to content

Commit f3433d7

Browse files
Vaishali Thakkarjgunthorpe
authored andcommitted
RDMA/rtrs-clt: Rename rtrs_clt to rtrs_clt_sess
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 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vaishali Thakkar <[email protected]> Signed-off-by: Jack Wang <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]>
1 parent f7ecac6 commit f3433d7

File tree

6 files changed

+77
-71
lines changed

6 files changed

+77
-71
lines changed

drivers/block/rnbd/rnbd-clt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ static void msg_conf(void *priv, int errno)
433433
schedule_work(&iu->work);
434434
}
435435

436-
static int send_usr_msg(struct rtrs_clt *rtrs, int dir,
436+
static int send_usr_msg(struct rtrs_clt_sess *rtrs, int dir,
437437
struct rnbd_iu *iu, struct kvec *vec,
438438
size_t len, struct scatterlist *sg, unsigned int sg_len,
439439
void (*conf)(struct work_struct *work),
@@ -1010,7 +1010,7 @@ static int rnbd_client_xfer_request(struct rnbd_clt_dev *dev,
10101010
struct request *rq,
10111011
struct rnbd_iu *iu)
10121012
{
1013-
struct rtrs_clt *rtrs = dev->sess->rtrs;
1013+
struct rtrs_clt_sess *rtrs = dev->sess->rtrs;
10141014
struct rtrs_permit *permit = iu->permit;
10151015
struct rnbd_msg_io msg;
10161016
struct rtrs_clt_req_ops req_ops;

drivers/block/rnbd/rnbd-clt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ struct rnbd_cpu_qlist {
7575

7676
struct rnbd_clt_session {
7777
struct list_head list;
78-
struct rtrs_clt *rtrs;
78+
struct rtrs_clt_sess *rtrs;
7979
wait_queue_head_t rtrs_waitq;
8080
bool rtrs_ready;
8181
struct rnbd_cpu_qlist __percpu

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ static ssize_t max_reconnect_attempts_show(struct device *dev,
5050
struct device_attribute *attr,
5151
char *page)
5252
{
53-
struct rtrs_clt *clt = container_of(dev, struct rtrs_clt, dev);
53+
struct rtrs_clt_sess *clt = container_of(dev, struct rtrs_clt_sess,
54+
dev);
5455

5556
return sysfs_emit(page, "%d\n",
5657
rtrs_clt_get_max_reconnect_attempts(clt));
@@ -63,7 +64,8 @@ static ssize_t max_reconnect_attempts_store(struct device *dev,
6364
{
6465
int value;
6566
int ret;
66-
struct rtrs_clt *clt = container_of(dev, struct rtrs_clt, dev);
67+
struct rtrs_clt_sess *clt = container_of(dev, struct rtrs_clt_sess,
68+
dev);
6769

6870
ret = kstrtoint(buf, 10, &value);
6971
if (ret) {
@@ -90,9 +92,9 @@ static ssize_t mpath_policy_show(struct device *dev,
9092
struct device_attribute *attr,
9193
char *page)
9294
{
93-
struct rtrs_clt *clt;
95+
struct rtrs_clt_sess *clt;
9496

95-
clt = container_of(dev, struct rtrs_clt, dev);
97+
clt = container_of(dev, struct rtrs_clt_sess, dev);
9698

9799
switch (clt->mp_policy) {
98100
case MP_POLICY_RR:
@@ -114,12 +116,12 @@ static ssize_t mpath_policy_store(struct device *dev,
114116
const char *buf,
115117
size_t count)
116118
{
117-
struct rtrs_clt *clt;
119+
struct rtrs_clt_sess *clt;
118120
int value;
119121
int ret;
120122
size_t len = 0;
121123

122-
clt = container_of(dev, struct rtrs_clt, dev);
124+
clt = container_of(dev, struct rtrs_clt_sess, dev);
123125

124126
ret = kstrtoint(buf, 10, &value);
125127
if (!ret && (value == MP_POLICY_RR ||
@@ -169,12 +171,12 @@ static ssize_t add_path_store(struct device *dev,
169171
.src = &srcaddr,
170172
.dst = &dstaddr
171173
};
172-
struct rtrs_clt *clt;
174+
struct rtrs_clt_sess *clt;
173175
const char *nl;
174176
size_t len;
175177
int err;
176178

177-
clt = container_of(dev, struct rtrs_clt, dev);
179+
clt = container_of(dev, struct rtrs_clt_sess, dev);
178180

179181
nl = strchr(buf, '\n');
180182
if (nl)
@@ -425,7 +427,7 @@ static const struct attribute_group rtrs_clt_path_attr_group = {
425427

426428
int rtrs_clt_create_path_files(struct rtrs_clt_path *clt_path)
427429
{
428-
struct rtrs_clt *clt = clt_path->clt;
430+
struct rtrs_clt_sess *clt = clt_path->clt;
429431
char str[NAME_MAX];
430432
int err;
431433
struct rtrs_addr path = {
@@ -497,12 +499,12 @@ static const struct attribute_group rtrs_clt_attr_group = {
497499
.attrs = rtrs_clt_attrs,
498500
};
499501

500-
int rtrs_clt_create_sysfs_root_files(struct rtrs_clt *clt)
502+
int rtrs_clt_create_sysfs_root_files(struct rtrs_clt_sess *clt)
501503
{
502504
return sysfs_create_group(&clt->dev.kobj, &rtrs_clt_attr_group);
503505
}
504506

505-
void rtrs_clt_destroy_sysfs_root(struct rtrs_clt *clt)
507+
void rtrs_clt_destroy_sysfs_root(struct rtrs_clt_sess *clt)
506508
{
507509
sysfs_remove_group(&clt->dev.kobj, &rtrs_clt_attr_group);
508510

0 commit comments

Comments
 (0)