mirror of
https://github.com/trapexit/mergerfs.git
synced 2026-10-26 19:01:56 -04:00
remove defaults, hard code atomic_o_trunc, big_writes, and default_permissions
`defaults` is a value used by all filesystems and isn't passed through to mergerfs when mounting via the fstab or the mount command. This led to inconsistent application of options. atomic_o_trunc, big_writes, and default_permissions should be enabled all the time anyway and splice_* can lead to issues so they are not always enabled.
This commit is contained in:
parent
21d690a210
commit
c5b2415daf
5 changed files with 35 additions and 58 deletions
|
|
@ -62,7 +62,6 @@ namespace local
|
|||
return local::ioctl(fi->fd,cmd_,data_);
|
||||
}
|
||||
|
||||
#ifdef FUSE_IOCTL_DIR
|
||||
|
||||
#ifndef O_NOATIME
|
||||
#define O_NOATIME 0
|
||||
|
|
@ -119,7 +118,6 @@ namespace local
|
|||
cmd_,
|
||||
data_);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
namespace mergerfs
|
||||
|
|
@ -134,10 +132,8 @@ namespace mergerfs
|
|||
unsigned int flags_,
|
||||
void *data_)
|
||||
{
|
||||
#ifdef FUSE_IOCTL_DIR
|
||||
if(flags_ & FUSE_IOCTL_DIR)
|
||||
return local::ioctl_dir(ffi_,cmd_,data_);
|
||||
#endif
|
||||
|
||||
return local::ioctl_file(ffi_,cmd_,data_);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue