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

Remove config ioctl calls

Browse Source 
While they were going to be the new way of interacting with the runtime config
I've decided to use toml based config for mergerfs v3. In that case all updates
will happen through the config file and ioctl will only be used to load/reload
the config rather than a key:value like API.
This commit is contained in:
Antonio SJ Musumeci 2021-08-02 16:56:20 -04:00
parent 8e47bf4946
commit 61c2187c14
1 changed files with 2 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/fuse_ioctl.cpp
View File

@ -40,15 +40,8 @@ using std::vector;
typedef char IOCTL_BUF[4096];
#define IOCTL_APP_TYPE 0xDF
//#define IOCTL_READ_KEYS 0xD000DF00
//#define IOCTL_READ_VAL 0xD000DF01
//#define IOCTL_WRITE_VAL 0x5000DF02
//#define IOCTL_FILE_INFO 0xD000DF03
#define IOCTL_READ_KEYS _IOWR(IOCTL_APP_TYPE,0,IOCTL_BUF)
#define IOCTL_READ_VAL _IOWR(IOCTL_APP_TYPE,1,IOCTL_BUF)
#define IOCTL_WRITE_VAL _IOW(IOCTL_APP_TYPE,2,IOCTL_BUF)
#define IOCTL_FILE_INFO _IOWR(IOCTL_APP_TYPE,3,IOCTL_BUF)
//#define IOCTL_FILE_INFO 0xD000DF00
#define IOCTL_FILE_INFO _IOWR(IOCTL_APP_TYPE,0,IOCTL_BUF)
#ifndef FS_IOC_GETFLAGS
# define FS_IOC_GETFLAGS _IOR('f',1,long)
@ -199,58 +192,6 @@ namespace l
return s_.size();
}
static
int
read_keys(void *data_)
{
Config::Read cfg;
std::string keys;
cfg->keys(keys);
return l::strcpy(keys,data_);
}
static
int
read_val(void *data_)
{
Config::Read cfg;
int rv;
char *data;
std::string key;
std::string val;
data = (char*)data_;
data[sizeof(IOCTL_BUF) - 1] = '\0';
key = data;
rv = cfg->get(key,&val);
if(rv < 0)
return rv;
return l::strcpy(val,data_);
}
static
int
write_val(void *data_)
{
Config::Write cfg;
char *data;
std::string kv;
std::string key;
std::string val;
data = (char*)data_;
data[sizeof(IOCTL_BUF) - 1] = '\0';
kv = data;
str::splitkv(kv,'=',&key,&val);
return cfg->set(key,val);
}
static
int
file_basepath(const Policy::Search &searchFunc_,
@ -378,12 +319,6 @@ namespace FUSE
{
switch(cmd_)
{
case IOCTL_READ_KEYS:
return l::read_keys(data_);
case IOCTL_READ_VAL:
return l::read_val(data_);
case IOCTL_WRITE_VAL:
return l::write_val(data_);
case IOCTL_FILE_INFO:
return l::file_info(ffi_,data_);
}