]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #51197 from petrutlucian94/mingw-llvm
authorIlya Dryomov <idryomov@gmail.com>
Fri, 1 Sep 2023 14:21:35 +0000 (16:21 +0200)
committerGitHub <noreply@github.com>
Fri, 1 Sep 2023 14:21:35 +0000 (16:21 +0200)
windows: use mingw-llvm

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
1  2 
CMakeLists.txt
src/CMakeLists.txt
src/client/Client.cc
src/mds/MDCache.cc
src/mds/MDCache.h
src/tools/rbd_wnbd/rbd_wnbd.cc
src/tools/rbd_wnbd/rbd_wnbd.h

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
index fabd847cf9d1b2fd05f8a367e086c6dd035cdeb2,22441e7257bb0f5c5302463aedbb07460523a201..1f9223bb8aa046ec927f3eccd1c5ce77ee6d0e90
@@@ -1403,11 -1386,9 +1403,11 @@@ class MDCache 
    std::thread upkeeper;
    ceph::mutex upkeep_mutex = ceph::make_mutex("MDCache::upkeep_mutex");
    ceph::condition_variable upkeep_cvar;
-   time upkeep_last_trim = time::min();
-   time upkeep_last_release = time::min();
+   time upkeep_last_trim = clock::zero();
+   time upkeep_last_release = clock::zero();
    std::atomic<bool> upkeep_trim_shutdown{false};
 +
 +  uint64_t kill_shutdown_at = 0;
  };
  
  class C_MDS_RetryRequest : public MDSInternalContext {
Simple merge
Simple merge