From: Daniel Gryniewicz <dang@redhat.com>
Date: Wed, 13 Sep 2023 13:35:39 +0000 (-0400)
Subject: Merge pull request #51368 from dang/wip-dang-zipper-motr
X-Git-Tag: v19.0.0~488
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e19b3d95905e87a55c13fdfccd2be61c5e7851f7;p=ceph.git

Merge pull request #51368 from dang/wip-dang-zipper-motr

Fix MOTR build, and move MOTR and DAOS to proper location
---

e19b3d95905e87a55c13fdfccd2be61c5e7851f7
diff --cc src/rgw/CMakeLists.txt
index 79bc05a4df13,5e46c81902e0..d367f4b51c36
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@@ -217,16 -216,11 +217,16 @@@ if(WITH_RADOSGW_DBSTORE
    list(APPEND librgw_common_srcs rgw_sal_dbstore.cc)
  endif()
  if(WITH_RADOSGW_MOTR)
-   list(APPEND librgw_common_srcs rgw_sal_motr.cc)
+   list(APPEND librgw_common_srcs driver/motr/rgw_sal_motr.cc)
  endif()
  if(WITH_RADOSGW_DAOS)
-   list(APPEND librgw_common_srcs rgw_sal_daos.cc)
+   list(APPEND librgw_common_srcs driver/motr/rgw_sal_daos.cc)
  endif()
 +if(WITH_RADOSGW_D4N)
 +  list(APPEND librgw_common_srcs driver/d4n/d4n_directory.cc)
 +  list(APPEND librgw_common_srcs driver/d4n/d4n_datacache.cc)
 +  list(APPEND librgw_common_srcs driver/d4n/rgw_sal_d4n.cc)
 +endif()
  if(WITH_JAEGER)
    list(APPEND librgw_common_srcs rgw_tracer.cc)
  endif()
diff --cc src/rgw/rgw_sal.cc
index 042eab0be725,009eb34e736b..bd17f279f89e
--- a/src/rgw/rgw_sal.cc
+++ b/src/rgw/rgw_sal.cc
@@@ -31,12 -31,9 +31,12 @@@
  #include "rgw_sal_dbstore.h"
  #include "driver/dbstore/config/store.h"
  #endif
 +#ifdef WITH_RADOSGW_D4N
 +#include "driver/d4n/rgw_sal_d4n.h" 
 +#endif
  
  #ifdef WITH_RADOSGW_MOTR
- #include "rgw_sal_motr.h"
+ #include "driver/motr/rgw_sal_motr.h"
  #endif
  
  #ifdef WITH_RADOSGW_DAOS