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

RDMA/rtrs-clt: Kill rtrs_clt_disconnect_from_sysfs 

The function is just a wrapper of rtrs_clt_close_conns, let's call
rtrs_clt_close_conns directly.

Link: https://lore.kernel.org/r/20210528113018.52290-10-jinpu.wang@ionos.com


Signed-off-by: default avatarGuoqing Jiang <guoqing.jiang@ionos.com>
Signed-off-by: default avatarJack Wang <jinpu.wang@ionos.com>
Signed-off-by: default avatarGioh Kim <gi-oh.kim@ionos.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 5e82ac7c

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

+1 −4
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ static ssize_t rtrs_clt_disconnect_store(struct kobject *kobj, 
					  const char *buf, size_t count)

{

	struct rtrs_clt_sess *sess;

	int ret;



	sess = container_of(kobj, struct rtrs_clt_sess, kobj);

	if (!sysfs_streq(buf, "1")) {
@@ -258,9 +257,7 @@ static ssize_t rtrs_clt_disconnect_store(struct kobject *kobj, 
			  attr->attr.name, buf);

		return -EINVAL;

	}

	ret = rtrs_clt_disconnect_from_sysfs(sess);

	if (ret)

		return ret;

	rtrs_clt_close_conns(sess, true);



	return count;

}

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

+1 −8
Original line number Diff line number Diff line
@@ -1859,7 +1859,7 @@ static int rtrs_rdma_conn_rejected(struct rtrs_clt_con *con, 
	return -ECONNRESET;

}



static void rtrs_clt_close_conns(struct rtrs_clt_sess *sess, bool wait)

void rtrs_clt_close_conns(struct rtrs_clt_sess *sess, bool wait)

{

	if (rtrs_clt_change_state_get_old(sess, RTRS_CLT_CLOSING, NULL))

		queue_work(rtrs_wq, &sess->close_work);
@@ -2831,13 +2831,6 @@ int rtrs_clt_reconnect_from_sysfs(struct rtrs_clt_sess *sess) 
	return err;

}



int rtrs_clt_disconnect_from_sysfs(struct rtrs_clt_sess *sess)

{

	rtrs_clt_close_conns(sess, true);



	return 0;

}



int rtrs_clt_remove_path_from_sysfs(struct rtrs_clt_sess *sess,

				     const struct attribute *sysfs_self)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static inline struct rtrs_permit *get_permit(struct rtrs_clt *clt, int idx) 
}



int rtrs_clt_reconnect_from_sysfs(struct rtrs_clt_sess *sess);

int rtrs_clt_disconnect_from_sysfs(struct rtrs_clt_sess *sess);

void rtrs_clt_close_conns(struct rtrs_clt_sess *sess, 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,