diff options
| author | Yehuda Sadeh <yehuda@hq.newdream.net> | 2011-06-16 14:19:47 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@hq.newdream.net> | 2011-06-16 14:19:47 -0700 |
| commit | abfa872f64cc02afbbe9a2d51660594389623d86 (patch) | |
| tree | 4e2ef312099dc0a5171e1d300b71cf9d6a53ca53 /src/messages | |
| parent | 8b4b83842cdf2e707efd6c3aded9abbf1ab352d7 (diff) | |
| parent | 062ddf25a29dc0fc3e35b4fbe86f32bcc4a509c4 (diff) | |
| download | ceph-abfa872f64cc02afbbe9a2d51660594389623d86.tar.gz | |
Merge remote-tracking branch 'origin/master' into rgw-multipart
Conflicts:
src/os/FileStore.cc
src/rgw/rgw_admin.cc
src/rgw/rgw_fs.h
src/rgw/rgw_log.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_user.cc
src/rgw/rgw_user.h
Diffstat (limited to 'src/messages')
| -rw-r--r-- | src/messages/MDiscoverReply.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h index 00c2e78f236..67433a150cc 100644 --- a/src/messages/MDiscoverReply.h +++ b/src/messages/MDiscoverReply.h @@ -196,8 +196,11 @@ public: ::decode(starts_with, p); ::decode(trace, p); + if (header.version >= 2) + ::decode(wanted_ino, p); } void encode_payload() { + header.version = 2; ::encode(base_ino, payload); ::encode(base_dir_frag, payload); ::encode(wanted_base_dir, payload); @@ -212,6 +215,7 @@ public: ::encode(starts_with, payload); ::encode(trace, payload); + ::encode(wanted_ino, payload); } }; |