diff options
| author | Dan Mick <dan.mick@inktank.com> | 2012-10-02 16:06:59 -0700 |
|---|---|---|
| committer | Dan Mick <dan.mick@inktank.com> | 2012-10-02 16:06:59 -0700 |
| commit | 01bfe55962111ded4a1409619e22b1d1fe381202 (patch) | |
| tree | f1d44c7e972a1721c3175be61910864edf13114c | |
| parent | 72ca95663213b7ee0756dd7b9f9affe44295a9cf (diff) | |
| parent | 67a201d64b5b4f1a8effd677dd932680144265d6 (diff) | |
| download | ceph-01bfe55962111ded4a1409619e22b1d1fe381202.tar.gz | |
Merge branch 'wip-msgr' into next
| -rw-r--r-- | src/msg/DispatchQueue.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc index 2374d8ea80b..9f7cb661c02 100644 --- a/src/msg/DispatchQueue.cc +++ b/src/msg/DispatchQueue.cc @@ -211,7 +211,7 @@ void DispatchQueue::entry() } Connection *con = NULL; - if ((long)m < DispatchQueue::D_NUM_CODES) { + if ((unsigned long)m < DispatchQueue::D_NUM_CODES) { assert(inq == &local_queue); con = con_q.front(); con_q.pop_front(); @@ -226,16 +226,16 @@ void DispatchQueue::entry() if (dequeued) inq->put(); - if ((long)m == DispatchQueue::D_BAD_REMOTE_RESET) { + if ((unsigned long)m == DispatchQueue::D_BAD_REMOTE_RESET) { msgr->ms_deliver_handle_remote_reset(con); con->put(); - } else if ((long)m == DispatchQueue::D_CONNECT) { + } else if ((unsigned long)m == DispatchQueue::D_CONNECT) { msgr->ms_deliver_handle_connect(con); con->put(); - } else if ((long)m == DispatchQueue::D_ACCEPT) { + } else if ((unsigned long)m == DispatchQueue::D_ACCEPT) { msgr->ms_deliver_handle_accept(con); con->put(); - } else if ((long)m == DispatchQueue::D_BAD_RESET) { + } else if ((unsigned long)m == DispatchQueue::D_BAD_RESET) { msgr->ms_deliver_handle_reset(con); con->put(); } else { |