branches: add per branch minfreespace w/ original value as default

example: /mnt/disk0=RW,1G:/mnt/disk1=RW,2G
trapexit · Sep 5, 2020 · fc34539 · fc34539
1 parent 98c49b8
commit fc34539
Show file tree

Hide file tree

Showing 68 changed files with 2,902 additions and 710 deletions.
diff --git a/src/branch.cpp b/src/branch.cpp
diff --git a/src/branch.hpp b/src/branch.hpp
@@ -20,35 +20,56 @@
 
 #include "rwlock.hpp"
 #include "tofrom_string.hpp"
+#include "nonstd/optional.hpp"
 
 #include <string>
 #include <vector>
 
+#include <stdint.h>
 #include <pthread.h>
 
-class Branch
+class Branch : public ToFromString
 {
 public:
-  enum Mode
+  Branch(const uint64_t &default_minfreespace);
+
+public:
+  int from_string(const std::string &str);
+  std::string to_string(void) const;
+
+public:
+  enum class Mode
     {
       INVALID,
       RO,
       RW,
       NC
     };
 
+public:
   Mode        mode;
   std::string path;
+  uint64_t    minfreespace() const;
 
+public:
+  void set_minfreespace(const uint64_t minfreespace);
+
+public:
   bool ro(void) const;
   bool nc(void) const;
   bool ro_or_nc(void) const;
+
+private:
+  nonstd::optional<uint64_t>  _minfreespace;
+  const uint64_t             *_default_minfreespace;
 };
 
-class Branches : public std::vector<Branch>, public ToFromString
+typedef std::vector<Branch> BranchVec;
+
+class Branches : public ToFromString
 {
 public:
-  Branches();
+  Branches(const uint64_t &default_minfreespace_);
 
 public:
   int from_string(const std::string &str);
@@ -59,6 +80,8 @@ class Branches : public std::vector<Branch>, public ToFromString
 
 public:
   mutable pthread_rwlock_t lock;
+  BranchVec vec;
+  const uint64_t &default_minfreespace;
 };
 
 class SrcMounts : public ToFromString

diff --git a/src/config.cpp b/src/config.cpp
@@ -67,7 +67,7 @@ Config::Config()
 
   async_read(true),
   auto_cache(false),
-  branches(),
+  branches(minfreespace),
   cache_attr(1),
   cache_entry(1),
   cache_files(CacheFiles::ENUM::LIBFUSE),

diff --git a/src/from_string.cpp b/src/from_string.cpp
@@ -67,22 +67,22 @@ namespace str
       {
       case 'k':
       case 'K':
-        tmp *= 1024;
+        tmp *= 1024ULL;
         break;
 
       case 'm':
       case 'M':
-        tmp *= (1024 * 1024);
+        tmp *= (1024ULL * 1024ULL);
         break;
 
       case 'g':
       case 'G':
-        tmp *= (1024 * 1024 * 1024);
+        tmp *= (1024ULL * 1024ULL * 1024ULL);
         break;
 
       case 't':
       case 'T':
-        tmp *= (1024ULL * 1024 * 1024 * 1024);
+        tmp *= (1024ULL * 1024ULL * 1024ULL * 1024ULL);
         break;
 
       case '\0':

diff --git a/src/fs_findonfs.cpp b/src/fs_findonfs.cpp
@@ -24,10 +24,11 @@
 
 #include <string>
 
-namespace fs
+namespace l
 {
+  static
   int
-  findonfs(const Branches    &branches_,
+  findonfs(const BranchVec   &branches_,
            const std::string &fusepath_,
            const int          fd_,
            std::string       *basepath_)
@@ -37,7 +38,6 @@ namespace fs
     struct stat st;
     std::string fullpath;
     const Branch *branch;
-    const rwlock::ReadGuard guard(&branches_.lock);
 
     rv = fs::fstat(fd_,&st);
     if(rv == -1)
@@ -65,3 +65,17 @@ namespace fs
     return (errno=ENOENT,-1);
   }
 }
+
+namespace fs
+{
+  int
+  findonfs(const Branches    &branches_,
+           const std::string &fusepath_,
+           const int          fd_,
+           std::string       *basepath_)
+  {
+    rwlock::ReadGuard guard(branches_.lock);
+
+    return l::findonfs(branches_.vec,fusepath_,fd_,basepath_);
+  }
+}
diff --git a/src/fs_movefile.cpp b/src/fs_movefile.cpp
@@ -49,7 +49,6 @@ namespace l
   int
   movefile(Policy::Func::Create  createFunc_,
            const Branches       &branches_,
-           const uint64_t        minfreepsace_,
            const string         &fusepath_,
            int                  *origfd_)
   {
@@ -73,7 +72,7 @@ namespace l
     if(rv == -1)
       return -1;
 
-    rv = createFunc_(branches_,fusepath_,minfreepsace_,&fdout_path);
+    rv = createFunc_(branches_,fusepath_,&fdout_path);
     if(rv == -1)
       return -1;
 
@@ -135,22 +134,20 @@ namespace fs
   int
   movefile(const Policy   *policy_,
            const Branches &basepaths_,
-           const uint64_t  minfreepsace_,
            const string   &fusepath_,
            int            *origfd_)
   {
-    return l::movefile(policy_,basepaths_,minfreepsace_,fusepath_,origfd_);
+    return l::movefile(policy_,basepaths_,fusepath_,origfd_);
   }
 
   int
   movefile_as_root(const Policy   *policy_,
                    const Branches &basepaths_,
-                   const uint64_t  minfreepsace_,
                    const string   &fusepath_,
                    int            *origfd_)
   {
     const ugid::Set ugid(0,0);
 
-    return fs::movefile(policy_,basepaths_,minfreepsace_,fusepath_,origfd_);
+    return fs::movefile(policy_,basepaths_,fusepath_,origfd_);
   }
 }
diff --git a/src/fs_movefile.hpp b/src/fs_movefile.hpp
@@ -26,14 +26,12 @@ namespace fs
   int
   movefile(const Policy      *policy,
            const Branches    &branches,
-           const uint64_t     minfreepsace,
            const std::string &fusepath,
            int               *origfd);
 
   int
   movefile_as_root(const Policy      *policy,
                    const Branches    &branches,
-                   const uint64_t     minfreepsace,
                    const std::string &fusepath,
                    int               *origfd);
 }
diff --git a/src/fuse_access.cpp b/src/fuse_access.cpp
@@ -32,15 +32,14 @@ namespace l
   int
   access(Policy::Func::Search  searchFunc,
          const Branches       &branches_,
-         const uint64_t        minfreespace,
          const char           *fusepath,
          const int             mask)
   {
     int rv;
     string fullpath;
     vector<string> basepaths;
 
-    rv = searchFunc(branches_,fusepath,minfreespace,&basepaths);
+    rv = searchFunc(branches_,fusepath,&basepaths);
     if(rv == -1)
       return -errno;
 
@@ -64,7 +63,6 @@ namespace FUSE
 
     return l::access(config.func.access.policy,
                      config.branches,
-                     config.minfreespace,
                      fusepath,
                      mask);
   }

diff --git a/src/fuse_chmod.cpp b/src/fuse_chmod.cpp
@@ -71,14 +71,13 @@ namespace l
   int
   chmod(Policy::Func::Action  actionFunc_,
         const Branches       &branches_,
-        const uint64_t        minfreespace_,
         const char           *fusepath_,
         const mode_t          mode_)
   {
     int rv;
     vector<string> basepaths;
 
-    rv = actionFunc_(branches_,fusepath_,minfreespace_,&basepaths);
+    rv = actionFunc_(branches_,fusepath_,&basepaths);
     if(rv == -1)
       return -errno;
 
@@ -98,7 +97,6 @@ namespace FUSE
 
     return l::chmod(config.func.chmod.policy,
                     config.branches,
-                    config.minfreespace,
                     fusepath_,
                     mode_);
   }

diff --git a/src/fuse_chown.cpp b/src/fuse_chown.cpp
@@ -71,15 +71,14 @@ namespace l
   int
   chown(Policy::Func::Action  actionFunc_,
         const Branches       &branches_,
-        const uint64_t        minfreespace_,
         const char           *fusepath_,
         const uid_t           uid_,
         const gid_t           gid_)
   {
     int rv;
     vector<string> basepaths;
 
-    rv = actionFunc_(branches_,fusepath_,minfreespace_,&basepaths);
+    rv = actionFunc_(branches_,fusepath_,&basepaths);
     if(rv == -1)
       return -errno;
 
@@ -100,7 +99,6 @@ namespace FUSE
 
     return l::chown(config.func.chown.policy,
                     config.branches,
-                    config.minfreespace,
                     fusepath_,
                     uid_,
                     gid_);

diff --git a/src/fuse_create.cpp b/src/fuse_create.cpp
@@ -128,7 +128,6 @@ namespace l
   create(Policy::Func::Search  searchFunc_,
          Policy::Func::Create  createFunc_,
          const Branches       &branches_,
-         const uint64_t        minfreespace_,
          const char           *fusepath_,
          const mode_t          mode_,
          const mode_t          umask_,
@@ -143,11 +142,11 @@ namespace l
 
     fusedirpath = fs::path::dirname(fusepath_);
 
-    rv = searchFunc_(branches_,fusedirpath,minfreespace_,&existingpaths);
+    rv = searchFunc_(branches_,fusedirpath,&existingpaths);
     if(rv == -1)
       return -errno;
 
-    rv = createFunc_(branches_,fusedirpath,minfreespace_,&createpaths);
+    rv = createFunc_(branches_,fusedirpath,&createpaths);
     if(rv == -1)
       return -errno;
 
@@ -183,7 +182,6 @@ namespace FUSE
     return l::create(config.func.getattr.policy,
                      config.func.create.policy,
                      config.branches,
-                     config.minfreespace,
                      fusepath_,
                      mode_,
                      fc->umask,

diff --git a/src/fuse_getattr.cpp b/src/fuse_getattr.cpp
@@ -61,7 +61,6 @@ namespace l
   int
   getattr(Policy::Func::Search  searchFunc_,
           const Branches       &branches_,
-          const uint64_t        minfreespace_,
           const char           *fusepath_,
           struct stat          *st_,
           const bool            symlinkify_,
@@ -71,7 +70,7 @@ namespace l
     string fullpath;
     vector<string> basepaths;
 
-    rv = searchFunc_(branches_,fusepath_,minfreespace_,&basepaths);
+    rv = searchFunc_(branches_,fusepath_,&basepaths);
     if(rv == -1)
       return -errno;
 
@@ -108,7 +107,6 @@ namespace FUSE
 
     rv = l::getattr(config.func.getattr.policy,
                     config.branches,
-                    config.minfreespace,
                     fusepath_,
                     st_,
                     config.symlinkify,

diff --git a/src/fuse_getxattr.cpp b/src/fuse_getxattr.cpp
@@ -165,7 +165,6 @@ namespace l
   int
   getxattr(Policy::Func::Search  searchFunc_,
            const Branches       &branches_,
-           const size_t          minfreespace_,
            const char           *fusepath_,
            const char           *attrname_,
            char                 *buf_,
@@ -175,7 +174,7 @@ namespace l
     string fullpath;
     vector<string> basepaths;
 
-    rv = searchFunc_(branches_,fusepath_,minfreespace_,&basepaths);
+    rv = searchFunc_(branches_,fusepath_,&basepaths);
     if(rv == -1)
       return -errno;
 
@@ -222,7 +221,6 @@ namespace FUSE
 
     return l::getxattr(config.func.getxattr.policy,
                        config.branches,
-                       config.minfreespace,
                        fusepath_,
                        attrname_,
                        buf_,