From 96d7da9fe7374ddab62c7f56a059170a801e5c03 Mon Sep 17 00:00:00 2001
From: Samarah <samarah.uriarte@ibm.com>
Date: Tue, 5 Sep 2023 13:50:43 +0000
Subject: [PATCH] rgw: Change D4N and RedisDriver `ifndef` directives to
 `#pragma once`; make integer errors negative; fix filter includes

Signed-off-by: Samarah <samarah.uriarte@ibm.com>
---
 src/rgw/driver/d4n/d4n_directory.h | 5 +----
 src/rgw/driver/d4n/d4n_policy.h    | 5 +----
 src/rgw/driver/d4n/rgw_sal_d4n.cc  | 2 --
 src/rgw/driver/d4n/rgw_sal_d4n.h   | 1 +
 src/rgw/rgw_redis_driver.cc        | 2 +-
 src/rgw/rgw_redis_driver.h         | 7 ++-----
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/rgw/driver/d4n/d4n_directory.h b/src/rgw/driver/d4n/d4n_directory.h
index 06a33f9a24f..b4b90f5e571 100644
--- 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 6a514d80808..9b694510717 100644
--- 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 ab1fbeca32c..44da4831106 100644
--- 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 1b8c893c2e7..bda8aa9f199 100644
--- 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 64f4c4c61d8..e9c1006b606 100644
--- 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 7de75471a2f..bbe430d31ec 100644
--- 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
-- 
2.39.5