UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

libceph: verify state after retaking con lock after dispatch 

We drop the con mutex when delivering a message.  When we retake the
lock, we need to verify we are still in the OPEN state before
preparing to read the next tag, or else we risk stepping on a
connection that has been closed.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
This commit is contained in:
Sage Weil 2012-07-30 18:16:56 -07:00
parent 4f471e4a9c
commit 7b862e07b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/ceph/messenger.c
View File

@ -2003,7 +2003,6 @@ static void process_message(struct ceph_connection *con)
con->ops->dispatch(con, msg); con->ops->dispatch(con, msg);
mutex_lock(&con->mutex); mutex_lock(&con->mutex);
prepare_read_tag(con);
} }
@ -2213,6 +2212,8 @@ more:
if (con->in_tag == CEPH_MSGR_TAG_READY) if (con->in_tag == CEPH_MSGR_TAG_READY)
goto more; goto more;
process_message(con); process_message(con);
if (con->state == CON_STATE_OPEN)
prepare_read_tag(con);
goto more; goto more;
} }
if (con->in_tag == CEPH_MSGR_TAG_ACK) { if (con->in_tag == CEPH_MSGR_TAG_ACK) {