From c8d8f739f8c3d0b260547e9e788ae2e191b3f446 Mon Sep 17 00:00:00 2001
From: Matan Breizman <mbreizma@redhat.com>
Date: Mon, 19 Feb 2024 16:11:53 +0000
Subject: [PATCH] common/buffer_seastar: move to crimson/crimson/buffer_seastar

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---
 src/crimson/CMakeLists.txt                 | 2 +-
 src/crimson/auth/KeyRing.cc                | 2 +-
 src/{ => crimson}/common/buffer_seastar.cc | 0
 src/{ => crimson}/common/buffer_seastar.h  | 0
 src/test/crimson/test_denc.cc              | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{ => crimson}/common/buffer_seastar.cc (100%)
 rename src/{ => crimson}/common/buffer_seastar.h (100%)

diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
index 510ffbd9df996..6bbd7b49ec755 100644
--- a/src/crimson/CMakeLists.txt
+++ b/src/crimson/CMakeLists.txt
@@ -24,6 +24,7 @@ set(crimson_common_srcs
   common/throttle.cc
   common/tmap_helpers.cc
   common/tri_mutex.cc
+  common/buffer_seastar.cc
   crush/CrushLocation.cc)
 
 # the specialized version of ceph-common, where
@@ -35,7 +36,6 @@ add_library(crimson-common STATIC
   ${PROJECT_SOURCE_DIR}/src/common/bit_str.cc
   ${PROJECT_SOURCE_DIR}/src/common/bloom_filter.cc
   ${PROJECT_SOURCE_DIR}/src/common/buffer.cc
-  ${PROJECT_SOURCE_DIR}/src/common/buffer_seastar.cc
   ${PROJECT_SOURCE_DIR}/src/common/ceph_argparse.cc
   ${PROJECT_SOURCE_DIR}/src/common/ceph_context.cc
   ${PROJECT_SOURCE_DIR}/src/common/ceph_crypto.cc
diff --git a/src/crimson/auth/KeyRing.cc b/src/crimson/auth/KeyRing.cc
index 436e29c1bdd00..b64d2d0f78a82 100644
--- a/src/crimson/auth/KeyRing.cc
+++ b/src/crimson/auth/KeyRing.cc
@@ -10,7 +10,7 @@
 #include <seastar/core/future-util.hh>
 #include <seastar/core/reactor.hh>
 
-#include "common/buffer_seastar.h"
+#include "crimson/common/buffer_seastar.h"
 #include "auth/KeyRing.h"
 #include "include/denc.h"
 #include "crimson/common/buffer_io.h"
diff --git a/src/common/buffer_seastar.cc b/src/crimson/common/buffer_seastar.cc
similarity index 100%
rename from src/common/buffer_seastar.cc
rename to src/crimson/common/buffer_seastar.cc
diff --git a/src/common/buffer_seastar.h b/src/crimson/common/buffer_seastar.h
similarity index 100%
rename from src/common/buffer_seastar.h
rename to src/crimson/common/buffer_seastar.h
diff --git a/src/test/crimson/test_denc.cc b/src/test/crimson/test_denc.cc
index 10ebd6dce5756..568f81cdf7f62 100644
--- a/src/test/crimson/test_denc.cc
+++ b/src/test/crimson/test_denc.cc
@@ -2,7 +2,7 @@
 #include <seastar/core/temporary_buffer.hh>
 #include <gtest/gtest.h>
 #include "include/denc.h"
-#include "common/buffer_seastar.h"
+#include "crimson/common/buffer_seastar.h"
 
 using temporary_buffer = seastar::temporary_buffer<char>;
 using buffer_iterator = seastar_buffer_iterator;
-- 
2.39.5