RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 14:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

xio: fix reuse of outer loop index in inner loop

Browse Source 
Reported-by: Vu Pham <vuhuong@mellanox.com>
Signed-off-by: Casey Bodley <casey@cohortfs.com>
This commit is contained in:
Casey Bodley 2015-05-22 13:07:45 -04:00 committed by Vu Pham
parent 367a5fccf2
commit 33eae4ec2f
1 changed files with 3 additions and 6 deletions

9
src/msg/xio/XioConnection.cc
View File

@ -520,8 +520,7 @@ int XioConnection::discard_input_queue(uint32_t flags)
pthread_spin_unlock(&sp);
// mqueue
int ix, q_size = disc_q.size();
for (ix = 0; ix < q_size; ++ix) {
while (!disc_q.empty()) {
Message::Queue::iterator q_iter = disc_q.begin();
Message* m = &(*q_iter);
disc_q.erase(q_iter);
@ -529,8 +528,7 @@ int XioConnection::discard_input_queue(uint32_t flags)
}
// requeue
q_size = deferred_q.size();
for (ix = 0; ix < q_size; ++ix) {
while (!deferred_q.empty()) {
XioSubmit::Queue::iterator q_iter = deferred_q.begin();
XioSubmit* xs = &(*q_iter);
XioMsg* xmsg;
@ -539,8 +537,7 @@ int XioConnection::discard_input_queue(uint32_t flags)
xmsg = static_cast<XioMsg*>(xs);
deferred_q.erase(q_iter);
// release once for each chained xio_msg
for (ix = 0; ix < int(xmsg->hdr.msg_cnt); ++ix)
xmsg->put();
xmsg->put(xmsg->hdr.msg_cnt);
break;
case XioSubmit::INCOMING_MSG_RELEASE:
deferred_q.erase(q_iter);