]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #44147 from rzarzynski/wip-crimson-new-seastar
authorKefu Chai <tchaikov@gmail.com>
Wed, 8 Dec 2021 00:56:11 +0000 (08:56 +0800)
committerGitHub <noreply@github.com>
Wed, 8 Dec 2021 00:56:11 +0000 (08:56 +0800)
crimson: bump up Seastar to recent master and fix FTBFS

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
1  2 
src/crimson/os/alienstore/alien_store.cc

index 3790b7d06041d43ea4bf672b0253bf8de9551e53,c9c3116f81e02028c741cb7dca6b7a585f0eb481..904540a4c44ae512e1cd7e0f4733f587268a8307
@@@ -431,8 -427,10 +431,9 @@@ seastar::future<> AlienStore::do_transa
      std::move(txn),
      std::move(done),
      [this, ch, id] (auto &txn, auto &done) {
 -      return seastar::with_gate(transaction_gate, [this, ch, id, &txn, &done] {
        AlienCollection* alien_coll = static_cast<AlienCollection*>(ch.get());
-       return alien_coll->with_lock([this, ch, id, &txn, &done] {
+         // moving the `ch` is crucial for buildability on newer S* versions.
+       return alien_coll->with_lock([this, ch=std::move(ch), id, &txn, &done] {
          Context *crimson_wrapper =
            ceph::os::Transaction::collect_all_contexts(txn);
          assert(tp);