diff options
| author | Lucian Petrut <lpetrut@cloudbasesolutions.com> | 2020-05-05 13:25:28 +0200 |
|---|---|---|
| committer | Lucian Petrut <lpetrut@cloudbasesolutions.com> | 2020-07-08 08:38:39 +0200 |
| commit | 2d221a3bd108308d2832dbc2403979a4e7d7e940 (patch) | |
| tree | 08623cc01499d1cf7a327ff3188dbe3daa0c32f9 /src/libradosstriper | |
| parent | msg: fix encode function (diff) | |
| download | ceph-2d221a3bd108308d2832dbc2403979a4e7d7e940.tar.xz ceph-2d221a3bd108308d2832dbc2403979a4e7d7e940.zip | |
cls,rados,rbd,mds,common: Avoid name collision with Windows headers
There are a few name collisions between Windows headers and ceph.
Where possible, we'll update Ceph code to avoid redefinitions.
The following names overlap with Windows headers:
* ERROR, NO_ERROR
* DELETE
* LocalLock
* LOCK_SHARED, LOCK_EXCLUSIVE
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Diffstat (limited to 'src/libradosstriper')
| -rw-r--r-- | src/libradosstriper/RadosStriperImpl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libradosstriper/RadosStriperImpl.cc b/src/libradosstriper/RadosStriperImpl.cc index c484482cacc..60fafd46396 100644 --- a/src/libradosstriper/RadosStriperImpl.cc +++ b/src/libradosstriper/RadosStriperImpl.cc @@ -1069,7 +1069,7 @@ int libradosstriper::RadosStriperImpl::trunc(const std::string& soid, uint64_t s op.assert_exists(); std::string lockCookie = RadosStriperImpl::getUUID(); utime_t dur = utime_t(); - rados::cls::lock::lock(&op, RADOS_LOCK_NAME, LOCK_EXCLUSIVE, lockCookie, "", "", dur, 0); + rados::cls::lock::lock(&op, RADOS_LOCK_NAME, ClsLockType::EXCLUSIVE, lockCookie, "", "", dur, 0); int rc = m_ioCtx.operate(firstObjOid, &op); if (rc) return rc; // load layout and size @@ -1342,7 +1342,7 @@ int libradosstriper::RadosStriperImpl::openStripedObjectForRead( op.assert_exists(); *lockCookie = getUUID(); utime_t dur = utime_t(); - rados::cls::lock::lock(&op, RADOS_LOCK_NAME, LOCK_SHARED, *lockCookie, "Tag", "", dur, 0); + rados::cls::lock::lock(&op, RADOS_LOCK_NAME, ClsLockType::SHARED, *lockCookie, "Tag", "", dur, 0); std::string firstObjOid = getObjectId(soid, 0); int rc = m_ioCtx.operate(firstObjOid, &op); if (rc) { @@ -1371,7 +1371,7 @@ int libradosstriper::RadosStriperImpl::openStripedObjectForWrite(const std::stri op.assert_exists(); *lockCookie = getUUID(); utime_t dur = utime_t(); - rados::cls::lock::lock(&op, RADOS_LOCK_NAME, LOCK_SHARED, *lockCookie, "Tag", "", dur, 0); + rados::cls::lock::lock(&op, RADOS_LOCK_NAME, ClsLockType::SHARED, *lockCookie, "Tag", "", dur, 0); std::string firstObjOid = getObjectId(soid, 0); int rc = m_ioCtx.operate(firstObjOid, &op); if (rc) { |