Skip to content

Commit

Permalink
RDMA/rtrs-clt: Rename rtrs_clt to rtrs_clt_sess
Browse files Browse the repository at this point in the history
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/20220105180708.7774-6-jinpu.wang@ionos.com
Signed-off-by: Vaishali Thakkar <vaishali.thakkar@ionos.com>
Signed-off-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
  • Loading branch information
Vaishali Thakkar authored and Jason Gunthorpe committed Jan 7, 2022
1 parent f7ecac6 commit f3433d7
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 71 deletions.
4 changes: 2 additions & 2 deletions drivers/block/rnbd/rnbd-clt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/rnbd/rnbd-clt.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 13 additions & 11 deletions drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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) {
Expand All @@ -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:
Expand All @@ -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 ||
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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);

Expand Down
Loading

0 comments on commit f3433d7

Please sign in to comment.