]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix s390x build failure 20969/head
authorNathan Cutler <ncutler@suse.com>
Tue, 20 Mar 2018 08:28:24 +0000 (09:28 +0100)
committerNathan Cutler <ncutler@suse.com>
Tue, 20 Mar 2018 08:57:50 +0000 (09:57 +0100)
46de629c3d0bfae5eba3f6b810808938b5a9af1f introduced a regression: on big-endian
machines, there was no matching function for call to 'eversion_t::encode(const
version_t&, ceph::bufferlist&) const' and 'eversion_t::decode(version_t&,
ceph::buffer::list::iterator&)'

Fixes: http://tracker.ceph.com/issues/23238
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/osd/osd_types.h

index a2bdacb23e70bbfc083b37155c38b083c598db55..bf18c00e9044f82d0b5103668fbbe8616d5cb8ef 100644 (file)
@@ -821,6 +821,7 @@ public:
 #if defined(CEPH_LITTLE_ENDIAN)
     bl.append((char *)this, sizeof(version_t) + sizeof(epoch_t));
 #else
+    using ceph::encode;
     encode(version, bl);
     encode(epoch, bl);
 #endif
@@ -829,6 +830,7 @@ public:
 #if defined(CEPH_LITTLE_ENDIAN)
     bl.copy(sizeof(version_t) + sizeof(epoch_t), (char *)this);
 #else
+    using ceph::decode;
     decode(version, bl);
     decode(epoch, bl);
 #endif