From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 8 Dec 2021 00:56:11 +0000 (+0800)
Subject: Merge pull request #44147 from rzarzynski/wip-crimson-new-seastar
X-Git-Tag: v17.1.0~291
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b03d3d91650f88cb03ca7079804c194d2fefc5a4;p=ceph.git

Merge pull request #44147 from rzarzynski/wip-crimson-new-seastar

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>
---

b03d3d91650f88cb03ca7079804c194d2fefc5a4
diff --cc src/crimson/os/alienstore/alien_store.cc
index 3790b7d0604,c9c3116f81e..904540a4c44
--- a/src/crimson/os/alienstore/alien_store.cc
+++ b/src/crimson/os/alienstore/alien_store.cc
@@@ -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);