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:
Antonio SJ Musumeci 2019-01-30 21:58:48 -05:00
parent 21d690a210
commit c5b2415daf
5 changed files with 35 additions and 58 deletions

View file

@ -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_);
}