BlockStorage/repertory
1
0
Fork 0
Code Issues 6 Pull Requests Releases 8 Wiki Activity

fix macos deadlock
Some checks failed
BlockStorage/repertory_mac/pipeline/head This commit looks good
Details
BlockStorage/repertory/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Scott E. Graves
2025-08-02 19:18:22 -05:00
parent 3805a27cd5
commit 2df11b693c
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
repertory/librepertory/src/drives/fuse/remotefuse/remote_fuse_drive.cpp
View File

@@ -398,24 +398,27 @@ auto remote_fuse_drive::readdir_impl(std::string api_path, void *buf,
api_path.c_str(), static_cast<remote::file_offset>(offset), api_path.c_str(), static_cast<remote::file_offset>(offset),
f_info->fh, item_path)) == 0) { f_info->fh, item_path)) == 0) {
std::unique_ptr<struct stat> p_stat{nullptr}; std::unique_ptr<struct stat> p_stat{nullptr};
int stat_res{0};
if ((item_path == ".") || (item_path == "..")) { if ((item_path == ".") || (item_path == "..")) {
auto stat_res{api_error::success};
p_stat = std::make_unique<struct stat>(); p_stat = std::make_unique<struct stat>();
std::memset(p_stat.get(), 0, sizeof(struct stat)); std::memset(p_stat.get(), 0, sizeof(struct stat));
if (item_path == ".") { if (item_path == ".") {
stat_res = stat_res = getattr_impl(api_path, p_stat.get());
stat(utils::path::combine(get_mount_location(), {api_path}).c_str(), } else if (api_path == "/" && get_mount_location() != "/") {
auto local_res =
stat(utils::path::get_parent_path(get_mount_location()).c_str(),
p_stat.get()); p_stat.get());
if (local_res != 0) {
res = local_res;
break;
}
} else { } else {
stat_res = stat_res = getattr_impl(utils::path::get_parent_api_path(api_path),
stat(utils::path::get_parent_path( p_stat.get());
utils::path::combine(get_mount_location(), {api_path}))
.c_str(),
p_stat.get());
} }
if (stat_res != 0) { if (stat_res != api_error::success) {
res = stat_res; res = utils::from_api_error(stat_res);
break; break;
} }
} else { } else {