Commit b6e7b6a1 authored by Alex Elder's avatar Alex Elder

libceph: use a flag to indicate a fault has occurred

This just rearranges the logic in con_work() a little bit so that a
flag is used to indicate a fault has occurred.  This allows both the
fault and non-fault case to be handled the same way and avoids a
couple of nearly consecutive gotos.
Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 93209264
......@@ -2387,13 +2387,15 @@ static void con_work(struct work_struct *work)
{
struct ceph_connection *con = container_of(work, struct ceph_connection,
work.work);
bool fault = false;
int ret;
mutex_lock(&con->mutex);
restart:
if (con_sock_closed(con)) {
dout("%s: con %p SOCK_CLOSED\n", __func__, con);
goto fault;
fault = true;
goto done;
}
if (con_backoff(con)) {
dout("%s: con %p BACKOFF\n", __func__, con);
......@@ -2418,7 +2420,8 @@ static void con_work(struct work_struct *work)
goto restart;
if (ret < 0) {
con->error_msg = "socket error on read";
goto fault;
fault = true;
goto done;
}
ret = try_write(con);
......@@ -2426,20 +2429,17 @@ static void con_work(struct work_struct *work)
goto restart;
if (ret < 0) {
con->error_msg = "socket error on write";
goto fault;
fault = true;
}
done:
mutex_unlock(&con->mutex);
done_unlocked:
con->ops->put(con);
return;
fault:
if (fault)
con_fault(con);
mutex_unlock(&con->mutex);
if (fault)
con_fault_finish(con);
goto done_unlocked;
con->ops->put(con);
}
......
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