From: Adam C. Emerson <aemerson@redhat.com>
Date: Wed, 26 Jul 2017 22:08:05 +0000 (-0400)
Subject: {os,mds,common}: Disambiguate std::max and ceph::max
X-Git-Tag: v13.0.0~153^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa99d3f126e303f679deb8e54ddcddece8611ab0;p=ceph.git

{os,mds,common}: Disambiguate std::max and ceph::max

There will be a more thorough reckoning regarding namespaces later.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 5656e3a5e844..b82beb4e2158 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -2328,7 +2328,7 @@ bool Locker::check_inode_max_size(CInode *in, bool force_wrlock,
       update_size = false;
   }
 
-  calc_new_client_ranges(in, max(new_max_size, size), &new_ranges, &max_increased);
+  calc_new_client_ranges(in, ceph::max(new_max_size, size), &new_ranges, &max_increased);
 
   if (max_increased || latest->client_ranges != new_ranges)
     update_max = true;
diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
index f520240da3da..bdea6ac28108 100644
--- a/src/mds/PurgeQueue.cc
+++ b/src/mds/PurgeQueue.cc
@@ -599,7 +599,7 @@ bool PurgeQueue::drain(
     max_purge_ops = 0xffff;
   }
 
-  drain_initial = max(bytes_remaining, drain_initial);
+  drain_initial = ceph::max(bytes_remaining, drain_initial);
 
   *progress = drain_initial - bytes_remaining;
   *progress_total = drain_initial;
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index e74ea82c1a79..587e3b10e7e0 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -728,7 +728,7 @@ int64_t BlueStore::GarbageCollector::estimate(
 
       // update gc_start_offset/gc_end_offset if needed
       gc_start_offset = min(gc_start_offset, (uint64_t)it->e.blob_start());
-      gc_end_offset = max(gc_end_offset, (uint64_t)it->e.blob_end());
+      gc_end_offset = ceph::max(gc_end_offset, (uint64_t)it->e.blob_end());
 
       auto o = it->e.logical_offset;
       auto l = it->e.length;
diff --git a/src/tools/rebuild_mondb.cc b/src/tools/rebuild_mondb.cc
index 1d070fc230de..e38ac97cbf40 100644
--- a/src/tools/rebuild_mondb.cc
+++ b/src/tools/rebuild_mondb.cc
@@ -241,7 +241,7 @@ int update_osdmap(ObjectStore& fs, OSDSuperblock& sb, MonitorDBStore& ms)
   unsigned nadded = 0;
 
   OSDMap osdmap;
-  for (auto e = max(last_committed+1, sb.oldest_map);
+  for (auto e = ceph::max(last_committed+1, sb.oldest_map);
        e <= sb.newest_map; e++) {
     bool have_crc = false;
     uint32_t crc = -1;