Commit ffea6ad1 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Jason Gunthorpe

RDMA/rtrs-srv: Kill rtrs_srv_change_state_get_old

This function isn't needed since no caller checks the old_state of sess.

Link: https://lore.kernel.org/r/20201023074353.21946-11-jinpu.wang@cloud.ionos.comSigned-off-by: default avatarGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent c3b16b67
...@@ -113,28 +113,18 @@ static bool __rtrs_srv_change_state(struct rtrs_srv_sess *sess, ...@@ -113,28 +113,18 @@ static bool __rtrs_srv_change_state(struct rtrs_srv_sess *sess,
return changed; return changed;
} }
static bool rtrs_srv_change_state_get_old(struct rtrs_srv_sess *sess, static bool rtrs_srv_change_state(struct rtrs_srv_sess *sess,
enum rtrs_srv_state new_state, enum rtrs_srv_state new_state)
enum rtrs_srv_state *old_state)
{ {
bool changed; bool changed;
spin_lock_irq(&sess->state_lock); spin_lock_irq(&sess->state_lock);
*old_state = sess->state;
changed = __rtrs_srv_change_state(sess, new_state); changed = __rtrs_srv_change_state(sess, new_state);
spin_unlock_irq(&sess->state_lock); spin_unlock_irq(&sess->state_lock);
return changed; return changed;
} }
static bool rtrs_srv_change_state(struct rtrs_srv_sess *sess,
enum rtrs_srv_state new_state)
{
enum rtrs_srv_state old_state;
return rtrs_srv_change_state_get_old(sess, new_state, &old_state);
}
static void free_id(struct rtrs_srv_op *id) static void free_id(struct rtrs_srv_op *id)
{ {
if (!id) if (!id)
...@@ -471,10 +461,7 @@ static int send_io_resp_imm(struct rtrs_srv_con *con, struct rtrs_srv_op *id, ...@@ -471,10 +461,7 @@ static int send_io_resp_imm(struct rtrs_srv_con *con, struct rtrs_srv_op *id,
void close_sess(struct rtrs_srv_sess *sess) void close_sess(struct rtrs_srv_sess *sess)
{ {
enum rtrs_srv_state old_state; if (rtrs_srv_change_state(sess, RTRS_SRV_CLOSING))
if (rtrs_srv_change_state_get_old(sess, RTRS_SRV_CLOSING,
&old_state))
queue_work(rtrs_wq, &sess->close_work); queue_work(rtrs_wq, &sess->close_work);
WARN_ON(sess->state != RTRS_SRV_CLOSING); WARN_ON(sess->state != RTRS_SRV_CLOSING);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment