Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 19:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

libceph: use a flag to indicate a fault has occurred

Browse Source 
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: 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 9320926420
commit b6e7b6a119
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net/ceph/messenger.c
View File

@ -2387,13 +2387,15 @@ 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;
int ret; int ret;
mutex_lock(&con->mutex); mutex_lock(&con->mutex);
restart: restart:
if (con_sock_closed(con)) { if (con_sock_closed(con)) {
dout("%s: con %p SOCK_CLOSED\n", __func__, con); dout("%s: con %p SOCK_CLOSED\n", __func__, con);
goto fault; fault = true;
goto done;
} }
if (con_backoff(con)) { if (con_backoff(con)) {
dout("%s: con %p BACKOFF\n", __func__, con); dout("%s: con %p BACKOFF\n", __func__, con);
@ -2418,7 +2420,8 @@ restart:
goto restart; goto restart;
if (ret < 0) { if (ret < 0) {
con->error_msg = "socket error on read"; con->error_msg = "socket error on read";
goto fault; fault = true;
goto done;
} }
ret = try_write(con); ret = try_write(con);
@ -2426,20 +2429,17 @@ restart:
goto restart; goto restart;
if (ret < 0) { if (ret < 0) {
con->error_msg = "socket error on write"; con->error_msg = "socket error on write";
goto fault; fault = true;
} }
done: done:
if (fault)
con_fault(con);
mutex_unlock(&con->mutex); mutex_unlock(&con->mutex);
done_unlocked:
con->ops->put(con);
return;
fault: if (fault)
con_fault(con); con_fault_finish(con);
mutex_unlock(&con->mutex);
con_fault_finish(con); con->ops->put(con);
goto done_unlocked;
} }