From: Yan, Zheng <zyan@redhat.com>
Date: Sat, 17 Mar 2018 09:29:30 +0000 (+0800)
Subject: mds: replace MAX() with std::max()
X-Git-Tag: v13.1.0~413^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29bfcc7aea4a9e52fbe54d1967fc53ba20849037;p=ceph.git

mds: replace MAX() with std::max()

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/mds/SnapClient.cc b/src/mds/SnapClient.cc
index df667df3b807..82b1111cb225 100644
--- a/src/mds/SnapClient.cc
+++ b/src/mds/SnapClient.cc
@@ -31,9 +31,9 @@ void SnapClient::resend_queries()
   if (!waiting_for_version.empty() || (!synced && sync_reqid > 0)) {
     version_t want;
     if (!waiting_for_version.empty())
-      want = MAX(cached_version, waiting_for_version.rbegin()->first);
+      want = std::max<version_t>(cached_version, waiting_for_version.rbegin()->first);
     else
-      want = MAX(cached_version, 1);
+      want = std::max<version_t>(cached_version, 1);
     refresh(want, NULL);
     if (!synced)
       sync_reqid = last_reqid;
@@ -164,7 +164,7 @@ void SnapClient::sync(MDSInternalContextBase *onfinish)
 {
   dout(10) << __func__ << dendl;
 
-  refresh(MAX(cached_version, 1), onfinish);
+  refresh(std::max<version_t>(cached_version, 1), onfinish);
   synced = false;
   if (server_ready)
     sync_reqid = last_reqid;
diff --git a/src/mds/SnapClient.h b/src/mds/SnapClient.h
index 8c30b2cc338e..b9d8d71cbb81 100644
--- a/src/mds/SnapClient.h
+++ b/src/mds/SnapClient.h
@@ -97,7 +97,7 @@ public:
   bool is_synced() const { return synced; }
   void wait_for_sync(MDSInternalContextBase *c) {
     assert(!synced);
-    waiting_for_version[MAX(cached_version, 1)].push_back(c);
+    waiting_for_version[std::max<version_t>(cached_version, 1)].push_back(c);
   }
 
   snapid_t get_last_created() const { return cached_last_created; }
diff --git a/src/mds/SnapRealm.cc b/src/mds/SnapRealm.cc
index 055d243a74c8..935880a2449d 100644
--- a/src/mds/SnapRealm.cc
+++ b/src/mds/SnapRealm.cc
@@ -303,7 +303,7 @@ void SnapRealm::check_cache() const
   snapid_t last_destroyed = mdcache->mds->snapclient->get_last_destroyed();
   if (global || srnode.is_parent_global()) {
     last_created = mdcache->mds->snapclient->get_last_created();
-    seq = MAX(last_created, last_destroyed);
+    seq = std::max(last_created, last_destroyed);
   } else {
     last_created = srnode.last_created;
     seq = srnode.seq;