github-mirror/mergerfs
github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2025-03-14 09:55:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc fixes for older platforms

Browse Source
This commit is contained in:
Antonio SJ Musumeci 2023-08-21 23:30:08 -05:00
parent 51b65cd126
commit 8d7017273f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fs_mktemp.cpp
View File

@ -25,6 +25,7 @@
#include <cstdlib>
#include <string>
#include <tuple>
#define PAD_LEN 16
#define MAX_ATTEMPTS 3
@ -75,12 +76,12 @@ namespace fs
if((fd == -1) && (errno == EEXIST))
continue;
if(fd == -1)
return {-errno,std::string{}};
return std::make_tuple(-errno,std::string());
return {fd,tmp_filepath};
return std::make_tuple(fd,tmp_filepath);
}
return {-EEXIST,std::string{}};
return std::make_tuple(-EEXIST,std::string());
}
std::tuple<int,std::string>

13
src/gidcache.cpp
View File

@ -34,11 +34,10 @@
#include <unordered_map>
#include <mutex>
#include "gidcache.hpp"
std::mutex g_REGISTERED_CACHES_MUTEX;
std::unordered_map<pid_t,GIDCache*> g_REGISTERED_CACHES;
std::mutex g_REGISTERED_CACHES_MUTEX;
std::unordered_map<pthread_t,GIDCache*> g_REGISTERED_CACHES;
inline
@ -55,11 +54,11 @@ GIDCache::GIDCache()
{
std::lock_guard<std::mutex> guard(g_REGISTERED_CACHES_MUTEX);
pid_t tid;
bool inserted;
bool inserted;
pthread_t pthid;
tid = ::gettid();
inserted = g_REGISTERED_CACHES.emplace(tid,this).second;
pthid = pthread_self();
inserted = g_REGISTERED_CACHES.emplace(pthid,this).second;
assert(inserted == true);
}