Skip to content

Commit dea5782

Browse files
authored
Merge pull request ceph#66149 from amathuria/wip-amat-update-seastar-nov25
seastar: bump up seastar submodule Reviewed-by: Matan Breizman <[email protected]>
2 parents 31076e9 + 0d2870e commit dea5782

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/crimson/os/seastore/seastore.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,11 @@ Device::access_ertr::future<> SeaStore::_mkfs(uuid_d new_osd_fsid)
445445
// hmm?
446446
auto lister = rdir.experimental_list_directory();
447447
while (auto de = co_await lister()) {
448-
DEBUG("found file: {}", de->name);
449-
if (de->name.find("block.") == 0 && de->name.length() > 6 ) {
448+
auto& entry = de->get();
449+
DEBUG("found file: {}", entry.name);
450+
if (entry.name.find("block.") == 0 && entry.name.length() > 6 ) {
450451
// 6 for "block."
451-
std::string entry_name = de->name;
452+
std::string entry_name = entry.name;
452453
auto dtype_end = entry_name.find_first_of('.', 6);
453454
device_type_t dtype =
454455
string_to_device_type(

src/msg/Policy.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#pragma once
55

66
#include "include/ceph_features.h"
7+
#include <map>
78

89
namespace ceph::net {
910

src/seastar

Submodule seastar updated 184 files

0 commit comments

Comments
 (0)