kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libceph: use a do..while loop in con_work()

Browse source 
This just converts a manually-implemented loop into a do..while loop
in con_work().  It also moves handling of EAGAIN inside the blocks
where it's already been determined an error code was returned.

Also update a few dout() calls near the affected code for
consistency.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-02-19 12:25:57 -06:00
parent b6e7b6a119
commit 49659416ba
1 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
net/ceph/messenger.c
View file

@ -2387,51 +2387,53 @@ static void con_work(struct work_struct *work)
{ {
struct ceph_connection *con = container_of(work, struct ceph_connection, struct ceph_connection *con = container_of(work, struct ceph_connection,
work.work); work.work);
bool fault = false; bool fault;
int ret;
mutex_lock(&con->mutex); mutex_lock(&con->mutex);
restart: while (true) {
if (con_sock_closed(con)) { int ret;
dout("%s: con %p SOCK_CLOSED\n", __func__, con);
fault = true;
goto done;
}
if (con_backoff(con)) {
dout("%s: con %p BACKOFF\n", __func__, con);
goto done;
}
if (con->state == CON_STATE_STANDBY) {
dout("con_work %p STANDBY\n", con);
goto done;
}
if (con->state == CON_STATE_CLOSED) {
dout("con_work %p CLOSED\n", con);
BUG_ON(con->sock);
goto done;
}
if (con->state == CON_STATE_PREOPEN) {
dout("%s: con %p OPENING\n", __func__, con);
BUG_ON(con->sock);
}
ret = try_read(con); if ((fault = con_sock_closed(con))) {
if (ret == -EAGAIN) dout("%s: con %p SOCK_CLOSED\n", __func__, con);
goto restart; break;
if (ret < 0) { }
con->error_msg = "socket error on read"; if (con_backoff(con)) {
fault = true; dout("%s: con %p BACKOFF\n", __func__, con);
goto done; break;
} }
if (con->state == CON_STATE_STANDBY) {
dout("%s: con %p STANDBY\n", __func__, con);
break;
}
if (con->state == CON_STATE_CLOSED) {
dout("%s: con %p CLOSED\n", __func__, con);
BUG_ON(con->sock);
break;
}
if (con->state == CON_STATE_PREOPEN) {
dout("%s: con %p PREOPEN\n", __func__, con);
BUG_ON(con->sock);
}
ret = try_write(con); ret = try_read(con);
if (ret == -EAGAIN) if (ret < 0) {
goto restart; if (ret == -EAGAIN)
if (ret < 0) { continue;
con->error_msg = "socket error on write"; con->error_msg = "socket error on read";
fault = true; fault = true;
break;
}
ret = try_write(con);
if (ret < 0) {
if (ret == -EAGAIN)
continue;
con->error_msg = "socket error on write";
fault = true;
}
break; /* If we make it to here, we're done */
} }
done:
if (fault) if (fault)
con_fault(con); con_fault(con);
mutex_unlock(&con->mutex); mutex_unlock(&con->mutex);
@ -2442,7 +2444,6 @@ done:
con->ops->put(con); con->ops->put(con);
} }
/* /*
* Generic error/fault handler. A retry mechanism is used with * Generic error/fault handler. A retry mechanism is used with
* exponential backoff * exponential backoff