From 755fa3e2061db5bb28683487216f084a80cf76fd Mon Sep 17 00:00:00 2001
From: Matt Benjamin <mbenjamin@redhat.com>
Date: Fri, 28 Jul 2023 13:28:32 -0400
Subject: [PATCH] rgw/file:  fix build of librgw_file_xattr.cc unit test

This resolves a header conflict seen with gcc 12 and clang 17, when
both rgw_file.h and rados/rgw_file.h were included (e.g., in
librgw_file_xattr.cc).

The operative change is the explicit path to rgw_file...h, but
I've renamed it as well to avoid confusion.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---
 src/rgw/rgw_file.cc                    | 2 +-
 src/rgw/{rgw_file.h => rgw_file_int.h} | 0
 src/rgw/rgw_lib_frontend.h             | 2 +-
 src/rgw/rgw_os_lib.cc                  | 2 +-
 src/test/librgw_file_marker.cc         | 4 ++--
 src/test/librgw_file_nfsns.cc          | 4 ++--
 src/test/librgw_file_xattr.cc          | 3 +--
 7 files changed, 8 insertions(+), 9 deletions(-)
 rename src/rgw/{rgw_file.h => rgw_file_int.h} (100%)

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index dbf85f491f559..5b61583090eec 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -23,7 +23,7 @@
 #include "rgw_user.h"
 #include "rgw_bucket.h"
 #include "rgw_zone.h"
-#include "rgw_file.h"
+#include "rgw_file_int.h"
 #include "rgw_lib_frontend.h"
 #include "rgw_perf_counters.h"
 #include "common/errno.h"
diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file_int.h
similarity index 100%
rename from src/rgw/rgw_file.h
rename to src/rgw/rgw_file_int.h
diff --git a/src/rgw/rgw_lib_frontend.h b/src/rgw/rgw_lib_frontend.h
index 1772724d218ed..c07358b9624f4 100644
--- a/src/rgw/rgw_lib_frontend.h
+++ b/src/rgw/rgw_lib_frontend.h
@@ -6,7 +6,7 @@
 #include <boost/container/flat_map.hpp>
 
 #include "rgw_lib.h"
-#include "rgw_file.h"
+#include "rgw_file_int.h"
 
 namespace rgw {
 
diff --git a/src/rgw/rgw_os_lib.cc b/src/rgw/rgw_os_lib.cc
index 55eb2fb4ba38e..11719eb1423b1 100644
--- a/src/rgw/rgw_os_lib.cc
+++ b/src/rgw/rgw_os_lib.cc
@@ -5,7 +5,7 @@
 #include "rgw_rest_s3.h"
 #include "rgw_rest_user.h"
 #include "rgw_os_lib.h"
-#include "rgw_file.h"
+#include "rgw_file_int.h"
 #include "rgw_lib_frontend.h"
 
 namespace rgw {
diff --git a/src/test/librgw_file_marker.cc b/src/test/librgw_file_marker.cc
index 44815bdebe182..1d39d2df50d3d 100644
--- a/src/test/librgw_file_marker.cc
+++ b/src/test/librgw_file_marker.cc
@@ -20,8 +20,8 @@
 
 #include "include/rados/librgw.h"
 #include "include/rados/rgw_file.h"
-#include "rgw_file.h"
-#include "rgw_lib_frontend.h" // direct requests
+#include "rgw/rgw_file_int.h"
+#include "rgw/rgw_lib_frontend.h" // direct requests
 
 #include "gtest/gtest.h"
 #include "common/ceph_argparse.h"
diff --git a/src/test/librgw_file_nfsns.cc b/src/test/librgw_file_nfsns.cc
index f38b03c465c63..ea603778a15fc 100644
--- a/src/test/librgw_file_nfsns.cc
+++ b/src/test/librgw_file_nfsns.cc
@@ -20,9 +20,9 @@
 
 #include "include/rados/librgw.h"
 #include "include/rados/rgw_file.h"
-#include "rgw_file.h"
 #include "rgw_lib.h"
-#include "rgw_lib_frontend.h" // direct requests
+#include "rgw/rgw_file_int.h"
+#include "rgw/rgw_lib_frontend.h" // direct requests
 
 #include "gtest/gtest.h"
 #include "common/ceph_argparse.h"
diff --git a/src/test/librgw_file_xattr.cc b/src/test/librgw_file_xattr.cc
index e112c40d16ef5..e1e04454cee59 100644
--- a/src/test/librgw_file_xattr.cc
+++ b/src/test/librgw_file_xattr.cc
@@ -19,11 +19,10 @@
 #include <map>
 #include <random>
 #include <boost/algorithm/string.hpp>
-#include "xxhash.h"
 
 #include "include/rados/librgw.h"
 #include "include/rados/rgw_file.h"
-#include "rgw_file.h"
+#include "rgw/rgw_file_int.h"
 
 #include "gtest/gtest.h"
 #include "common/ceph_argparse.h"
-- 
2.39.5