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

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

diff --cc src/rgw/CMakeLists.txt
index 79bc05a4df13aa7d0ed70560cb281cc1ee733c49,5e46c81902e072a9ecb061b4fd2f1ac16ba49c80..d367f4b51c3641c14dc07c408a8990fb45c3a753
--- 1/src/rgw/CMakeLists.txt
--- 2/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 042eab0be7257ee8c2451e6f870eaa40c6df9bd8,009eb34e736b725cb85c7482a92a704583ebae03..bd17f279f89efa992e74a6d68f728ebb4d572e8f
--- 1/src/rgw/rgw_sal.cc
--- 2/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