rgw: Change D4N and RedisDriver `ifndef` directives to `#pragma once`; make integer...

Signed-off-by: Samarah <samarah.uriarte@ibm.com>

diff --git a/src/rgw/driver/d4n/d4n_directory.h b/src/rgw/driver/d4n/d4n_directory.h
index 06a33f9a24fdde1d74694016bb1171ad2ddac6ff..b4b90f5e571de6f27f76f8a6e46fc710c2706ac5 100644 (file)
--- a/src/rgw/driver/d4n/d4n_directory.h
+++ b/src/rgw/driver/d4n/d4n_directory.h
@@ -1,5 +1,4 @@
-#ifndef CEPH_D4NDIRECTORY_H
-#define CEPH_D4NDIRECTORY_H
+#pragma once
 
 #include "rgw_common.h"
 #include <cpp_redis/cpp_redis>
@@ -97,5 +96,3 @@ class BlockDirectory: public Directory {
 };
 
 } } // namespace rgw::d4n
-
-#endif

diff --git a/src/rgw/driver/d4n/d4n_policy.h b/src/rgw/driver/d4n/d4n_policy.h
index 6a514d80808804583228723a9a8b6bc0cf40da60..9b694510717a5865e0e7062dbc31a2f24d28cf01 100644 (file)
--- a/src/rgw/driver/d4n/d4n_policy.h
+++ b/src/rgw/driver/d4n/d4n_policy.h
@@ -1,5 +1,4 @@
-#ifndef CEPH_D4NPOLICY_H
-#define CEPH_D4NPOLICY_H
+#pragma once
 
 #include <string>
 #include <iostream>
@@ -101,5 +100,3 @@ class PolicyDriver {
 };
 
 } } // namespace rgw::d4n
-
-#endif

diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.cc b/src/rgw/driver/d4n/rgw_sal_d4n.cc
index ab1fbeca32c1fb65a3436fb63e974a4258d99337..44da48311061a4c82c2671e2741a0eeee6a79e3d 100644 (file)
--- a/src/rgw/driver/d4n/rgw_sal_d4n.cc
+++ b/src/rgw/driver/d4n/rgw_sal_d4n.cc
@@ -13,8 +13,6 @@
  *
  */
 
-#include "rgw_redis_driver.h"
-#include "rgw_ssd_driver.h"
 #include "rgw_sal_d4n.h"
 
 #define dout_subsys ceph_subsys_rgw

diff --git a/src/rgw/driver/d4n/rgw_sal_d4n.h b/src/rgw/driver/d4n/rgw_sal_d4n.h
index 1b8c893c2e7949dcfa314c3ea3f53ac08e132ab6..bda8aa9f19929428f2c9613ba713108efaa72181 100644 (file)
--- a/src/rgw/driver/d4n/rgw_sal_d4n.h
+++ b/src/rgw/driver/d4n/rgw_sal_d4n.h
@@ -21,6 +21,7 @@
 #include "rgw_role.h"
 #include "common/dout.h" 
 #include "rgw_aio_throttle.h"
+#include "rgw_ssd_driver.h"
 
 #include "rgw_redis_driver.h"
 #include "driver/d4n/d4n_directory.h"

diff --git a/src/rgw/rgw_redis_driver.cc b/src/rgw/rgw_redis_driver.cc
index 64f4c4c61d8435d35dd943e128b7ee07389cb04f..e9c1006b606bc4ba8af18914fe5146688c0b0ec5 100644 (file)
--- a/src/rgw/rgw_redis_driver.cc
+++ b/src/rgw/rgw_redis_driver.cc
@@ -146,7 +146,7 @@ int RedisDriver::initialize(CephContext* cct, const DoutPrefixProvider* dpp)
 
   if (addr.host == "" || addr.port == 0) {
     ldpp_dout(dpp, 10) << "RGW Redis Cache: Redis cache endpoint was not configured correctly" << dendl;
-    return EDESTADDRREQ;
+    return -EDESTADDRREQ;
   }
 
   client.connect("127.0.0.1", 6379, nullptr);

diff --git a/src/rgw/rgw_redis_driver.h b/src/rgw/rgw_redis_driver.h
index 7de75471a2f554a8d983c14f097e80f0f3acdbb0..bbe430d31ecbdc9f148cd4a285548804ececf66f 100644 (file)
--- a/src/rgw/rgw_redis_driver.h
+++ b/src/rgw/rgw_redis_driver.h
@@ -1,5 +1,4 @@
-#ifndef CEPH_REDISDRIVER_H
-#define CEPH_REDISDRIVER_H
+#pragma once
 
 //#include <aedis.hpp>
 #include <aio.h>
@@ -104,6 +103,4 @@ class RedisDriver : public CacheDriver {
     };
 };
 
-} } // namespace rgw::cal
-    
-#endif
+} } // namespace rgw::cache