github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2024-11-26 10:13:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #95 from trapexit/flags

Browse Source 
move requesting of FUSE flags to init from cli args
This commit is contained in:
Antonio SJ Musumeci 2015-08-05 11:50:54 -04:00
commit ac41bc43f3
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/init.cpp
View File

@ -33,9 +33,27 @@ namespace mergerfs
void *
init(struct fuse_conn_info *conn)
{
#ifdef FUSE_CAP_ASYNC_READ
conn->want |= FUSE_CAP_ASYNC_READ;
#endif
#ifdef FUSE_CAP_IOCTL_DIR
conn->want |= FUSE_CAP_IOCTL_DIR;
#endif
#ifdef FUSE_CAP_ATOMIC_O_TRUNC
conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
#endif
#ifdef FUSE_CAP_BIG_WRITES
conn->want |= FUSE_CAP_BIG_WRITES;
#endif
#ifdef FUSE_CAP_SPLICE_WRITE
conn->want |= FUSE_CAP_SPLICE_WRITE;
#endif
#ifdef FUSE_CAP_SPLICE_READ
conn->want |= FUSE_CAP_SPLICE_READ;
#endif
#ifdef FUSE_CAP_SPLICE_MOVE
conn->want |= FUSE_CAP_SPLICE_MOVE;
#endif
return &config::get_writable();
}

10
src/option_parser.cpp
View File

@ -94,12 +94,12 @@ static
void
set_default_options(struct fuse_args &args)
{
set_option(args,"big_writes");
set_option(args,"splice_read");
set_option(args,"splice_write");
set_option(args,"splice_move");
// set_option(args,"big_writes");
// set_option(args,"splice_read");
// set_option(args,"splice_write");
// set_option(args,"splice_move");
set_option(args,"auto_cache");
set_option(args,"atomic_o_trunc");
// set_option(args,"atomic_o_trunc");
}
static