summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lang <samlang@gmail.com>2013-04-11 09:08:04 -0700
committerSam Lang <samlang@gmail.com>2013-04-11 09:08:04 -0700
commitd777b8e66b2e950266e52589c129b00f77b8afc0 (patch)
tree2a223b04503c8745408d334d7eb4f3e189d6da8f
parente32849c4eef2f5d911288aabeac0a6967b1e6ae4 (diff)
parenta1d9cbe5af25dc7e6b5ce81ff08c854c7ee0187b (diff)
downloadceph-d777b8e66b2e950266e52589c129b00f77b8afc0.tar.gz
Merge pull request #213 from ceph/wip-sessionmap-4644
mds: fix session_info_t decoding Reviewed-by: Sam Lang <sam.lang@inktank.com>
-rw-r--r--src/mds/mdstypes.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc
index ad4a71acba5..b1ce640a539 100644
--- a/src/mds/mdstypes.cc
+++ b/src/mds/mdstypes.cc
@@ -541,9 +541,9 @@ void session_info_t::decode(bufferlist::iterator& p)
{
DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, p);
::decode(inst, p);
- if (struct_v == 2) {
+ if (struct_v <= 2) {
set<tid_t> s;
- ::decode(completed_requests, p);
+ ::decode(s, p);
while (!s.empty()) {
completed_requests[*s.begin()] = inodeno_t();
s.erase(s.begin());