diff --git a/src/access.cpp b/src/access.cpp index cd2e9c17..e48a40ea 100644 --- a/src/access.cpp +++ b/src/access.cpp @@ -34,7 +34,7 @@ static int _access(Policy::Func::Search searchFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const int mask) { diff --git a/src/chmod.cpp b/src/chmod.cpp index a25c960f..30d5f189 100644 --- a/src/chmod.cpp +++ b/src/chmod.cpp @@ -68,7 +68,7 @@ static int _chmod(Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const mode_t mode) { diff --git a/src/chown.cpp b/src/chown.cpp index dec28c59..a5f09b16 100644 --- a/src/chown.cpp +++ b/src/chown.cpp @@ -72,7 +72,7 @@ static int _chown(Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const uid_t uid, const gid_t gid) diff --git a/src/config.hpp b/src/config.hpp index fffac445..b3ad4771 100644 --- a/src/config.hpp +++ b/src/config.hpp @@ -45,7 +45,7 @@ namespace mergerfs std::string destmount; std::vector srcmounts; mutable pthread_rwlock_t srcmountslock; - size_t minfreespace; + uint64_t minfreespace; bool moveonenospc; public: diff --git a/src/create.cpp b/src/create.cpp index a1e2455c..741e0d8f 100644 --- a/src/create.cpp +++ b/src/create.cpp @@ -71,7 +71,7 @@ int _create(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const mode_t mode, const int flags, diff --git a/src/fs.cpp b/src/fs.cpp index ecfcc72f..b2177886 100644 --- a/src/fs.cpp +++ b/src/fs.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -73,8 +74,8 @@ namespace fs bool info(const string &path, bool &readonly, - size_t &spaceavail, - size_t &spaceused) + uint64_t &spaceavail, + uint64_t &spaceused) { bool rv; struct statvfs st; @@ -103,7 +104,7 @@ namespace fs bool spaceavail(const string &path, - size_t &spaceavail) + uint64_t &spaceavail) { bool rv; struct statvfs st; @@ -117,7 +118,7 @@ namespace fs bool spaceused(const string &path, - size_t &spaceused) + uint64_t &spaceused) { bool rv; struct statvfs st; @@ -231,7 +232,7 @@ namespace fs int mfs(const vector &basepaths, - const size_t minfreespace, + const uint64_t minfreespace, string &path) { fsblkcnt_t mfs; @@ -241,7 +242,7 @@ namespace fs mfsbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { - size_t spaceavail; + uint64_t spaceavail; const string &basepath = basepaths[i]; if(!fs::spaceavail(basepath,spaceavail)) diff --git a/src/fs.hpp b/src/fs.hpp index 84a79c26..f5981d47 100644 --- a/src/fs.hpp +++ b/src/fs.hpp @@ -17,12 +17,13 @@ #ifndef __FS_HPP__ #define __FS_HPP__ +#include + #include #include namespace fs { - using std::size_t; using std::string; using std::vector; @@ -35,16 +36,16 @@ namespace fs bool info(const string &path, bool &readonly, - size_t &spaceavail, - size_t &spaceused); + uint64_t &spaceavail, + uint64_t &spaceused); bool readonly(const string &path); bool spaceavail(const string &path, - size_t &spaceavail); + uint64_t &spaceavail); bool spaceused(const string &path, - size_t &spaceavail); + uint64_t &spaceavail); void findallfiles(const vector &srcmounts, const char *fusepath, @@ -63,7 +64,7 @@ namespace fs int getfl(const int fd); int mfs(const vector &srcs, - const size_t minfreespace, + const uint64_t minfreespace, string &path); }; diff --git a/src/fs_xattr.hpp b/src/fs_xattr.hpp index 2c7e2e08..66d411ab 100644 --- a/src/fs_xattr.hpp +++ b/src/fs_xattr.hpp @@ -25,7 +25,6 @@ namespace fs { namespace xattr { - using std::size_t; using std::string; using std::vector; using std::map; diff --git a/src/getattr.cpp b/src/getattr.cpp index 7df15af3..ca0b5b1d 100644 --- a/src/getattr.cpp +++ b/src/getattr.cpp @@ -62,7 +62,7 @@ static int _getattr(Policy::Func::Search searchFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, struct stat &buf) { diff --git a/src/ioctl.cpp b/src/ioctl.cpp index 19bdbb0e..b362e375 100644 --- a/src/ioctl.cpp +++ b/src/ioctl.cpp @@ -58,7 +58,7 @@ static int _ioctl_dir_base(Policy::Func::Search searchFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const int cmd, void *data) diff --git a/src/link.cpp b/src/link.cpp index b7a6f30c..58bc3ee1 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -88,7 +88,7 @@ int _link_create_path(Policy::Func::Search searchFunc, Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *oldfusepath, const char *newfusepath) { @@ -117,7 +117,7 @@ int _clonepath_if_would_create(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const string &oldbasepath, const char *oldfusepath, const char *newfusepath) @@ -158,7 +158,7 @@ int _link_preserve_path_core(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const string &oldbasepath, const char *oldfusepath, const char *newfusepath, @@ -190,7 +190,7 @@ int _link_preserve_path_loop(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *oldfusepath, const char *newfusepath, const vector &oldbasepaths) @@ -216,9 +216,9 @@ _link_preserve_path(Policy::Func::Search searchFunc, Policy::Func::Action actionFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, - const char *oldfusepath, - const char *newfusepath) + const uint64_t minfreespace, + const char *oldfusepath, + const char *newfusepath) { int rv; vector oldbasepaths; diff --git a/src/listxattr.cpp b/src/listxattr.cpp index 7f66df70..1282c742 100644 --- a/src/listxattr.cpp +++ b/src/listxattr.cpp @@ -74,7 +74,7 @@ static int _listxattr(Policy::Func::Search searchFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, char *list, const size_t size) diff --git a/src/mkdir.cpp b/src/mkdir.cpp index 47d021e8..4c1baccb 100644 --- a/src/mkdir.cpp +++ b/src/mkdir.cpp @@ -85,7 +85,7 @@ int _mkdir(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const mode_t mode) { diff --git a/src/mknod.cpp b/src/mknod.cpp index d032c3b1..6ccc3fcf 100644 --- a/src/mknod.cpp +++ b/src/mknod.cpp @@ -89,7 +89,7 @@ int _mknod(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const mode_t mode, const dev_t dev) diff --git a/src/num.cpp b/src/num.cpp index 4b1ac7b9..7f6a0ec4 100644 --- a/src/num.cpp +++ b/src/num.cpp @@ -14,6 +14,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include @@ -21,11 +22,11 @@ namespace num { int - to_size_t(const std::string &str, - size_t &value) + to_uint64_t(const std::string &str, + uint64_t &value) { - size_t tmp; - char *endptr; + char *endptr; + uint64_t tmp; tmp = strtoll(str.c_str(),&endptr,10); switch(*endptr) diff --git a/src/num.hpp b/src/num.hpp index da390497..a2db43cc 100644 --- a/src/num.hpp +++ b/src/num.hpp @@ -14,9 +14,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include namespace num { - int to_size_t(const std::string &str, size_t &value); + int to_uint64_t(const std::string &str, uint64_t &value); } diff --git a/src/open.cpp b/src/open.cpp index 2fcc8cdb..febc86d7 100644 --- a/src/open.cpp +++ b/src/open.cpp @@ -58,7 +58,7 @@ static int _open(Policy::Func::Search searchFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const int flags, uint64_t &fh) diff --git a/src/option_parser.cpp b/src/option_parser.cpp index 784c396a..0711b94f 100644 --- a/src/option_parser.cpp +++ b/src/option_parser.cpp @@ -107,11 +107,11 @@ set_default_options(fuse_args &args) static int parse_and_process_minfreespace(const std::string &value, - size_t &minfreespace) + uint64_t &minfreespace) { int rv; - rv = num::to_size_t(value,minfreespace); + rv = num::to_uint64_t(value,minfreespace); if(rv == -1) return 1; diff --git a/src/policy.hpp b/src/policy.hpp index d825c7f6..0119fe4c 100644 --- a/src/policy.hpp +++ b/src/policy.hpp @@ -63,15 +63,14 @@ namespace mergerfs struct Func { typedef std::string string; - typedef std::size_t size_t; typedef std::vector strvec; typedef std::vector cstrptrvec; typedef const string cstring; - typedef const size_t csize_t; + typedef const uint64_t cuint64_t; typedef const strvec cstrvec; typedef const Category::Enum::Type CType; - typedef int (*Ptr)(CType,cstrvec &,const char *,csize_t,cstrptrvec &); + typedef int (*Ptr)(CType,cstrvec &,const char *,cuint64_t,cstrptrvec &); template class Base @@ -82,7 +81,7 @@ namespace mergerfs {} int - operator()(cstrvec &b,const char *c,csize_t d,cstrptrvec &e) + operator()(cstrvec &b,const char *c,cuint64_t d,cstrptrvec &e) { return func(T,b,c,d,e); } @@ -95,18 +94,18 @@ namespace mergerfs typedef Base Create; typedef Base Search; - static int invalid(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int all(CType,cstrvec&,const char*,csize_t,cstrptrvec&); - static int eplfs(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int eplus(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int epmfs(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int erofs(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int ff(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int lfs(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int lus(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int mfs(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int newest(CType,cstrvec&,const char *,csize_t,cstrptrvec&); - static int rand(CType,cstrvec&,const char *,csize_t,cstrptrvec&); + static int invalid(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int all(CType,cstrvec&,const char*,cuint64_t,cstrptrvec&); + static int eplfs(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int eplus(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int epmfs(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int erofs(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int ff(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int lfs(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int lus(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int mfs(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int newest(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); + static int rand(CType,cstrvec&,const char *,cuint64_t,cstrptrvec&); }; private: @@ -165,8 +164,8 @@ namespace mergerfs static const Policy &find(const Enum::Type); public: - static const std::vector _policies_; - static const Policy * const policies; + static const std::vector _policies_; + static const Policy * const policies; static const Policy &invalid; static const Policy &all; diff --git a/src/policy_all.cpp b/src/policy_all.cpp index b5581383..f23835fd 100644 --- a/src/policy_all.cpp +++ b/src/policy_all.cpp @@ -25,19 +25,18 @@ using std::string; using std::vector; -using std::size_t; static int _all_create(const vector &basepaths, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { bool readonly; - size_t spaceavail; - size_t _spaceused; + uint64_t spaceavail; + uint64_t _spaceused; const string *basepath = &basepaths[i]; if(!fs::info(*basepath,readonly,spaceavail,_spaceused)) @@ -88,7 +87,7 @@ namespace mergerfs Policy::Func::all(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { if(type == Category::Enum::create) diff --git a/src/policy_eplfs.cpp b/src/policy_eplfs.cpp index df139d57..10ddf3c5 100644 --- a/src/policy_eplfs.cpp +++ b/src/policy_eplfs.cpp @@ -26,27 +26,26 @@ using std::string; using std::vector; -using std::size_t; using mergerfs::Category; static int _eplfs_create(const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { string fullpath; - size_t eplfs; + uint64_t eplfs; const string *eplfsbasepath; - eplfs = std::numeric_limits::max(); + eplfs = std::numeric_limits::max(); eplfsbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { bool readonly; - size_t spaceavail; - size_t _spaceused; + uint64_t spaceavail; + uint64_t _spaceused; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -81,14 +80,14 @@ _eplfs_other(const vector &basepaths, vector &paths) { string fullpath; - size_t eplfs; + uint64_t eplfs; const string *eplfsbasepath; - eplfs = std::numeric_limits::max(); + eplfs = std::numeric_limits::max(); eplfsbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { - size_t spaceavail; + uint64_t spaceavail; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -117,7 +116,7 @@ int _eplfs(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { if(type == Category::Enum::create) @@ -132,7 +131,7 @@ namespace mergerfs Policy::Func::eplfs(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { int rv; diff --git a/src/policy_eplus.cpp b/src/policy_eplus.cpp index ebfe9ffa..ee88ccb5 100644 --- a/src/policy_eplus.cpp +++ b/src/policy_eplus.cpp @@ -26,27 +26,26 @@ using std::string; using std::vector; -using std::size_t; using mergerfs::Category; static int _eplus_create(const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { string fullpath; - size_t eplus; + uint64_t eplus; const string *eplusbasepath; - eplus = std::numeric_limits::max(); + eplus = std::numeric_limits::max(); eplusbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { bool readonly; - size_t spaceavail; - size_t spaceused; + uint64_t spaceavail; + uint64_t spaceused; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -81,14 +80,14 @@ _eplus_other(const vector &basepaths, vector &paths) { string fullpath; - size_t eplus; + uint64_t eplus; const string *eplusbasepath; eplus = 0; eplusbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { - size_t spaceused; + uint64_t spaceused; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -117,7 +116,7 @@ int _eplus(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { if(type == Category::Enum::create) @@ -132,8 +131,8 @@ namespace mergerfs Policy::Func::eplus(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, - vector &paths) + const uint64_t minfreespace, + vector &paths) { int rv; diff --git a/src/policy_epmfs.cpp b/src/policy_epmfs.cpp index 1db62095..c9a2db9f 100644 --- a/src/policy_epmfs.cpp +++ b/src/policy_epmfs.cpp @@ -26,27 +26,26 @@ using std::string; using std::vector; -using std::size_t; using mergerfs::Category; static int _epmfs_create(const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { string fullpath; - size_t epmfs; + uint64_t epmfs; const string *epmfsbasepath; - epmfs = std::numeric_limits::min(); + epmfs = std::numeric_limits::min(); epmfsbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { bool readonly; - size_t spaceavail; - size_t _spaceused; + uint64_t spaceavail; + uint64_t _spaceused; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -81,14 +80,14 @@ _epmfs_other(const vector &basepaths, vector &paths) { string fullpath; - size_t epmfs; + uint64_t epmfs; const string *epmfsbasepath; epmfs = 0; epmfsbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { - size_t spaceavail; + uint64_t spaceavail; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -117,7 +116,7 @@ int _epmfs(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { if(type == Category::Enum::create) @@ -132,8 +131,8 @@ namespace mergerfs Policy::Func::epmfs(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, - vector &paths) + const uint64_t minfreespace, + vector &paths) { int rv; diff --git a/src/policy_erofs.cpp b/src/policy_erofs.cpp index f4ad7fa4..dc470139 100644 --- a/src/policy_erofs.cpp +++ b/src/policy_erofs.cpp @@ -30,7 +30,7 @@ namespace mergerfs Policy::Func::erofs(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { return POLICY_FAIL_ERRNO(EROFS); diff --git a/src/policy_ff.cpp b/src/policy_ff.cpp index acf5217a..1e830277 100644 --- a/src/policy_ff.cpp +++ b/src/policy_ff.cpp @@ -25,12 +25,11 @@ using std::string; using std::vector; -using std::size_t; static int _ff_create(const vector &basepaths, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { const string *fallback; @@ -39,8 +38,8 @@ _ff_create(const vector &basepaths, for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { bool readonly; - size_t spaceavail; - size_t _spaceused; + uint64_t spaceavail; + uint64_t _spaceused; const string *basepath = &basepaths[i]; if(!fs::info(*basepath,readonly,spaceavail,_spaceused)) @@ -96,7 +95,7 @@ namespace mergerfs Policy::Func::ff(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { if(type == Category::Enum::create) diff --git a/src/policy_invalid.cpp b/src/policy_invalid.cpp index 02f228cb..2398009d 100644 --- a/src/policy_invalid.cpp +++ b/src/policy_invalid.cpp @@ -23,7 +23,6 @@ using std::string; using std::vector; -using std::size_t; namespace mergerfs { @@ -31,7 +30,7 @@ namespace mergerfs Policy::Func::invalid(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { return POLICY_FAIL_ERRNO(EINVAL); diff --git a/src/policy_lfs.cpp b/src/policy_lfs.cpp index b371ac1d..e95aa7b7 100644 --- a/src/policy_lfs.cpp +++ b/src/policy_lfs.cpp @@ -26,26 +26,25 @@ using std::string; using std::vector; -using std::size_t; using mergerfs::Category; static int _lfs_create(const vector &basepaths, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { string fullpath; - size_t lfs; + uint64_t lfs; const string *lfsbasepath; - lfs = std::numeric_limits::max(); + lfs = std::numeric_limits::max(); lfsbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { bool readonly; - size_t spaceavail; - size_t _spaceused; + uint64_t spaceavail; + uint64_t _spaceused; const string *basepath = &basepaths[i]; if(!fs::info(*basepath,readonly,spaceavail,_spaceused)) @@ -76,14 +75,14 @@ _lfs_other(const vector &basepaths, vector &paths) { string fullpath; - size_t lfs; + uint64_t lfs; const string *lfsbasepath; - lfs = std::numeric_limits::max(); + lfs = std::numeric_limits::max(); lfsbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { - size_t spaceavail; + uint64_t spaceavail; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -112,7 +111,7 @@ int _lfs(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { if(type == Category::Enum::create) @@ -128,7 +127,7 @@ namespace mergerfs Policy::Func::lfs(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { int rv; diff --git a/src/policy_lus.cpp b/src/policy_lus.cpp index a58b168f..bfb34c4e 100644 --- a/src/policy_lus.cpp +++ b/src/policy_lus.cpp @@ -26,26 +26,25 @@ using std::string; using std::vector; -using std::size_t; using mergerfs::Category; static int _lus_create(const vector &basepaths, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { string fullpath; - size_t lus; + uint64_t lus; const string *lusbasepath; - lus = std::numeric_limits::max(); + lus = std::numeric_limits::max(); lusbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { bool readonly; - size_t spaceused; - size_t spaceavail; + uint64_t spaceused; + uint64_t spaceavail; const string *basepath = &basepaths[i]; if(!fs::info(*basepath,readonly,spaceavail,spaceused)) @@ -76,14 +75,14 @@ _lus_other(const vector &basepaths, vector &paths) { string fullpath; - size_t lus; + uint64_t lus; const string *lusbasepath; lus = 0; lusbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { - size_t spaceused; + uint64_t spaceused; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -112,7 +111,7 @@ int _lus(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { if(type == Category::Enum::create) @@ -127,7 +126,7 @@ namespace mergerfs Policy::Func::lus(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { int rv; diff --git a/src/policy_mfs.cpp b/src/policy_mfs.cpp index aa6772ef..17c80170 100644 --- a/src/policy_mfs.cpp +++ b/src/policy_mfs.cpp @@ -25,7 +25,6 @@ using std::string; using std::vector; -using std::size_t; using mergerfs::Category; static @@ -34,7 +33,7 @@ _mfs_create(const vector &basepaths, vector &paths) { string fullpath; - size_t mfs; + uint64_t mfs; const string *mfsbasepath; mfs = 0; @@ -42,8 +41,8 @@ _mfs_create(const vector &basepaths, for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { bool readonly; - size_t spaceavail; - size_t _spaceused; + uint64_t spaceavail; + uint64_t _spaceused; const string *basepath = &basepaths[i]; if(!fs::info(*basepath,readonly,spaceavail,_spaceused)) @@ -72,14 +71,14 @@ _mfs_other(const vector &basepaths, vector &paths) { string fullpath; - size_t mfs; + uint64_t mfs; const string *mfsbasepath; mfs = 0; mfsbasepath = NULL; for(size_t i = 0, ei = basepaths.size(); i != ei; i++) { - size_t spaceavail; + uint64_t spaceavail; const string *basepath = &basepaths[i]; fs::path::make(basepath,fusepath,fullpath); @@ -122,7 +121,7 @@ namespace mergerfs Policy::Func::mfs(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { int rv; diff --git a/src/policy_newest.cpp b/src/policy_newest.cpp index 357360e7..f4edd2c2 100644 --- a/src/policy_newest.cpp +++ b/src/policy_newest.cpp @@ -28,7 +28,6 @@ using std::string; using std::vector; -using std::size_t; static int @@ -111,7 +110,7 @@ namespace mergerfs Policy::Func::newest(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { if(type == Category::Enum::create) diff --git a/src/policy_rand.cpp b/src/policy_rand.cpp index 2ae770d2..687afb7b 100644 --- a/src/policy_rand.cpp +++ b/src/policy_rand.cpp @@ -25,7 +25,6 @@ using std::string; using std::vector; -using std::size_t; namespace mergerfs { @@ -33,7 +32,7 @@ namespace mergerfs Policy::Func::rand(const Category::Enum::Type type, const vector &basepaths, const char *fusepath, - const size_t minfreespace, + const uint64_t minfreespace, vector &paths) { int rv; diff --git a/src/readlink.cpp b/src/readlink.cpp index 5bc30201..cf0d6d32 100644 --- a/src/readlink.cpp +++ b/src/readlink.cpp @@ -56,7 +56,7 @@ static int _readlink(Policy::Func::Search searchFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, char *buf, const size_t size) diff --git a/src/removexattr.cpp b/src/removexattr.cpp index 5b1857b6..40fc1a22 100644 --- a/src/removexattr.cpp +++ b/src/removexattr.cpp @@ -73,7 +73,7 @@ static int _removexattr(Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const char *attrname) { diff --git a/src/rename.cpp b/src/rename.cpp index 4825a15a..bff0447c 100644 --- a/src/rename.cpp +++ b/src/rename.cpp @@ -104,7 +104,7 @@ int _rename_create_path(Policy::Func::Search searchFunc, Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *oldfusepath, const char *newfusepath) { @@ -146,7 +146,7 @@ static int _clonepath(Policy::Func::Search searchFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const string &dstbasepath, const string &fusedirpath) { @@ -170,7 +170,7 @@ int _clonepath_if_would_create(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const string &oldbasepath, const char *oldfusepath, const char *newfusepath) @@ -196,7 +196,7 @@ void _rename_preserve_path_core(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const vector &oldbasepaths, const string &oldbasepath, const char *oldfusepath, @@ -243,7 +243,7 @@ _rename_preserve_path(Policy::Func::Search searchFunc, Policy::Func::Action actionFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *oldfusepath, const char *newfusepath) { diff --git a/src/rmdir.cpp b/src/rmdir.cpp index 39523fd9..8c66f51b 100644 --- a/src/rmdir.cpp +++ b/src/rmdir.cpp @@ -68,7 +68,7 @@ static int _rmdir(Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath) { int rv; diff --git a/src/setxattr.cpp b/src/setxattr.cpp index c807c3d0..aac13736 100644 --- a/src/setxattr.cpp +++ b/src/setxattr.cpp @@ -172,7 +172,7 @@ _setxattr_minfreespace(Config &config, if((flags & XATTR_CREATE) == XATTR_CREATE) return -EEXIST; - rv = num::to_size_t(attrval,config.minfreespace); + rv = num::to_uint64_t(attrval,config.minfreespace); if(rv == -1) return -EINVAL; @@ -335,7 +335,7 @@ static int _setxattr(Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const char *attrname, const char *attrval, diff --git a/src/statvfs_util.hpp b/src/statvfs_util.hpp index 06fe810b..d935329e 100644 --- a/src/statvfs_util.hpp +++ b/src/statvfs_util.hpp @@ -47,7 +47,7 @@ namespace StatVFS static inline - fsblkcnt_t + uint64_t spaceavail(const struct statvfs &st) { return (st.f_frsize * st.f_bavail); @@ -55,7 +55,7 @@ namespace StatVFS static inline - fsblkcnt_t + uint64_t spaceused(const struct statvfs &st) { return (st.f_frsize * (st.f_blocks - st.f_bavail)); diff --git a/src/symlink.cpp b/src/symlink.cpp index 8917591b..64d38ce2 100644 --- a/src/symlink.cpp +++ b/src/symlink.cpp @@ -84,7 +84,7 @@ int _symlink(Policy::Func::Search searchFunc, Policy::Func::Create createFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *oldpath, const char *newpath) { diff --git a/src/truncate.cpp b/src/truncate.cpp index 67b7c5ad..ba79c954 100644 --- a/src/truncate.cpp +++ b/src/truncate.cpp @@ -71,7 +71,7 @@ static int _truncate(Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const off_t size) { diff --git a/src/unlink.cpp b/src/unlink.cpp index f035569d..d8ff0fac 100644 --- a/src/unlink.cpp +++ b/src/unlink.cpp @@ -68,7 +68,7 @@ static int _unlink(Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath) { int rv; diff --git a/src/utimens.cpp b/src/utimens.cpp index ddc27576..34d918af 100644 --- a/src/utimens.cpp +++ b/src/utimens.cpp @@ -71,7 +71,7 @@ static int _utimens(Policy::Func::Action actionFunc, const vector &srcmounts, - const size_t minfreespace, + const uint64_t minfreespace, const char *fusepath, const timespec ts[2]) { diff --git a/src/write_buf.cpp b/src/write_buf.cpp index 2823eec9..204a465f 100644 --- a/src/write_buf.cpp +++ b/src/write_buf.cpp @@ -42,7 +42,7 @@ _write_buf(const int fd, fuse_bufvec &src, const off_t offset) { - size_t size = fuse_buf_size(&src); + size_t size = fuse_buf_size(&src); fuse_bufvec dst = FUSE_BUFVEC_INIT(size); const fuse_buf_copy_flags cpflags = (fuse_buf_copy_flags)(FUSE_BUF_SPLICE_MOVE|FUSE_BUF_SPLICE_NONBLOCK);