diff --git a/src/access.cpp b/src/access.cpp index f846ee58..f8652228 100644 --- a/src/access.cpp +++ b/src/access.cpp @@ -68,7 +68,7 @@ _access(Policy::Func::Search searchFunc, namespace mergerfs { - namespace access + namespace fuse { int access(const char *fusepath, diff --git a/src/access.hpp b/src/access.hpp index acaccc46..27f87888 100644 --- a/src/access.hpp +++ b/src/access.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace access + namespace fuse { int access(const char *fusepath, diff --git a/src/chmod.cpp b/src/chmod.cpp index 5e61261e..ee9b504d 100644 --- a/src/chmod.cpp +++ b/src/chmod.cpp @@ -68,7 +68,7 @@ _chmod(Policy::Func::Action actionFunc, namespace mergerfs { - namespace chmod + namespace fuse { int chmod(const char *fusepath, diff --git a/src/chmod.hpp b/src/chmod.hpp index ed552a91..fe57cbd9 100644 --- a/src/chmod.hpp +++ b/src/chmod.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace chmod + namespace fuse { int chmod(const char *fusepath, diff --git a/src/chown.cpp b/src/chown.cpp index f013c07c..41d8b1d8 100644 --- a/src/chown.cpp +++ b/src/chown.cpp @@ -70,7 +70,7 @@ _chown(Policy::Func::Action actionFunc, namespace mergerfs { - namespace chown + namespace fuse { int chown(const char *fusepath, diff --git a/src/chown.hpp b/src/chown.hpp index 24206cb9..66a3431b 100644 --- a/src/chown.hpp +++ b/src/chown.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace chown + namespace fuse { int chown(const char *fusepath, diff --git a/src/create.cpp b/src/create.cpp index 365a77ca..9b568d4b 100644 --- a/src/create.cpp +++ b/src/create.cpp @@ -86,7 +86,7 @@ _create(Policy::Func::Search searchFunc, namespace mergerfs { - namespace create + namespace fuse { int create(const char *fusepath, diff --git a/src/create.hpp b/src/create.hpp index cd5d3e00..c3cdd6d0 100644 --- a/src/create.hpp +++ b/src/create.hpp @@ -27,7 +27,7 @@ namespace mergerfs { - namespace create + namespace fuse { int create(const char *fusepath, diff --git a/src/destroy.cpp b/src/destroy.cpp index 0edf5847..e33777c1 100644 --- a/src/destroy.cpp +++ b/src/destroy.cpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace destroy + namespace fuse { void destroy(void *) diff --git a/src/destroy.hpp b/src/destroy.hpp index dbe0aa31..274896a4 100644 --- a/src/destroy.hpp +++ b/src/destroy.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace destroy + namespace fuse { void destroy(void *); diff --git a/src/fallocate.cpp b/src/fallocate.cpp index 6f6826b2..99a10234 100644 --- a/src/fallocate.cpp +++ b/src/fallocate.cpp @@ -64,7 +64,7 @@ _fallocate(const int fd, namespace mergerfs { - namespace fallocate + namespace fuse { int fallocate(const char *fusepath, diff --git a/src/fallocate.hpp b/src/fallocate.hpp index b23db070..f59560b5 100644 --- a/src/fallocate.hpp +++ b/src/fallocate.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace fallocate + namespace fuse { int fallocate(const char *fusepath, diff --git a/src/fgetattr.cpp b/src/fgetattr.cpp index 9a7eb9a0..6bebe8b6 100644 --- a/src/fgetattr.cpp +++ b/src/fgetattr.cpp @@ -43,7 +43,7 @@ _fgetattr(const int fd, namespace mergerfs { - namespace fgetattr + namespace fuse { int fgetattr(const char *fusepath, diff --git a/src/fgetattr.hpp b/src/fgetattr.hpp index 85264757..ccf91afe 100644 --- a/src/fgetattr.hpp +++ b/src/fgetattr.hpp @@ -28,7 +28,7 @@ namespace mergerfs { - namespace fgetattr + namespace fuse { int fgetattr(const char *fusepath, diff --git a/src/flush.cpp b/src/flush.cpp index ac5e6aff..97916358 100644 --- a/src/flush.cpp +++ b/src/flush.cpp @@ -44,7 +44,7 @@ _flush(const int fd) namespace mergerfs { - namespace flush + namespace fuse { int flush(const char *fusepath, diff --git a/src/flush.hpp b/src/flush.hpp index 9f878261..347fac5e 100644 --- a/src/flush.hpp +++ b/src/flush.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace flush + namespace fuse { int flush(const char *path, diff --git a/src/fsync.cpp b/src/fsync.cpp index 93c4f383..fb30c6fa 100644 --- a/src/fsync.cpp +++ b/src/fsync.cpp @@ -50,7 +50,7 @@ _fsync(const int fd, namespace mergerfs { - namespace fsync + namespace fuse { int fsync(const char *fusepath, diff --git a/src/fsync.hpp b/src/fsync.hpp index e5062bcd..20b56d6b 100644 --- a/src/fsync.hpp +++ b/src/fsync.hpp @@ -26,7 +26,7 @@ namespace mergerfs { - namespace fsync + namespace fuse { int fsync(const char *fusepath, diff --git a/src/ftruncate.cpp b/src/ftruncate.cpp index 1f6d7abf..538756fe 100644 --- a/src/ftruncate.cpp +++ b/src/ftruncate.cpp @@ -42,7 +42,7 @@ _ftruncate(const int fd, namespace mergerfs { - namespace ftruncate + namespace fuse { int ftruncate(const char *fusepath, diff --git a/src/ftruncate.hpp b/src/ftruncate.hpp index b8bad8e2..5be0841b 100644 --- a/src/ftruncate.hpp +++ b/src/ftruncate.hpp @@ -29,7 +29,7 @@ namespace mergerfs { - namespace ftruncate + namespace fuse { int ftruncate(const char *fusepath, diff --git a/src/getattr.cpp b/src/getattr.cpp index 63bea591..9a8bcd03 100644 --- a/src/getattr.cpp +++ b/src/getattr.cpp @@ -88,7 +88,7 @@ _getattr(Policy::Func::Search searchFunc, namespace mergerfs { - namespace getattr + namespace fuse { int getattr(const char *fusepath, diff --git a/src/getattr.hpp b/src/getattr.hpp index e062da48..71b7410a 100644 --- a/src/getattr.hpp +++ b/src/getattr.hpp @@ -28,7 +28,7 @@ namespace mergerfs { - namespace getattr + namespace fuse { int getattr(const char *fusepath, diff --git a/src/getxattr.cpp b/src/getxattr.cpp index 6e040d96..ba74eb7c 100644 --- a/src/getxattr.cpp +++ b/src/getxattr.cpp @@ -238,7 +238,7 @@ _getxattr(Policy::Func::Search searchFunc, namespace mergerfs { - namespace getxattr + namespace fuse { int getxattr(const char *fusepath, diff --git a/src/getxattr.hpp b/src/getxattr.hpp index 9c825edb..9b660c70 100644 --- a/src/getxattr.hpp +++ b/src/getxattr.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace getxattr + namespace fuse { int getxattr(const char *fusepath, diff --git a/src/init.cpp b/src/init.cpp index e532c1a5..c4839235 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -28,7 +28,7 @@ namespace mergerfs { - namespace init + namespace fuse { void * init(struct fuse_conn_info *conn) diff --git a/src/init.hpp b/src/init.hpp index 34a46aee..d7747736 100644 --- a/src/init.hpp +++ b/src/init.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace init + namespace fuse { void * init(struct fuse_conn_info *conn); diff --git a/src/ioctl.cpp b/src/ioctl.cpp index 3449b4c9..23c93f67 100644 --- a/src/ioctl.cpp +++ b/src/ioctl.cpp @@ -138,7 +138,7 @@ _ioctl_dir(const string &fusepath, namespace mergerfs { - namespace ioctl + namespace fuse { int ioctl(const char *fusepath, diff --git a/src/ioctl.hpp b/src/ioctl.hpp index b53eb131..18da1324 100644 --- a/src/ioctl.hpp +++ b/src/ioctl.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace ioctl + namespace fuse { int ioctl(const char *fusepath, diff --git a/src/link.cpp b/src/link.cpp index b27c75c3..87b30907 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -104,7 +104,7 @@ _link(Policy::Func::Search searchFunc, namespace mergerfs { - namespace link + namespace fuse { int link(const char *from, diff --git a/src/link.hpp b/src/link.hpp index c3673abf..51ba3cde 100644 --- a/src/link.hpp +++ b/src/link.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace link + namespace fuse { int link(const char *from, diff --git a/src/listxattr.cpp b/src/listxattr.cpp index 8c21795d..6e078952 100644 --- a/src/listxattr.cpp +++ b/src/listxattr.cpp @@ -102,7 +102,7 @@ _listxattr(Policy::Func::Search searchFunc, namespace mergerfs { - namespace listxattr + namespace fuse { int listxattr(const char *fusepath, diff --git a/src/listxattr.hpp b/src/listxattr.hpp index 123eead3..2223a218 100644 --- a/src/listxattr.hpp +++ b/src/listxattr.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace listxattr + namespace fuse { int listxattr(const char *fusepath, diff --git a/src/mergerfs.cpp b/src/mergerfs.cpp index 422d9965..145cb554 100644 --- a/src/mergerfs.cpp +++ b/src/mergerfs.cpp @@ -92,57 +92,57 @@ namespace local #endif ops.flag_nullpath_ok = false; - ops.access = mergerfs::access::access; + ops.access = mergerfs::fuse::access; ops.bmap = NULL; - ops.chmod = mergerfs::chmod::chmod; - ops.chown = mergerfs::chown::chown; - ops.create = mergerfs::create::create; - ops.destroy = mergerfs::destroy::destroy; + ops.chmod = mergerfs::fuse::chmod; + ops.chown = mergerfs::fuse::chown; + ops.create = mergerfs::fuse::create; + ops.destroy = mergerfs::fuse::destroy; #if FALLOCATE - ops.fallocate = mergerfs::fallocate::fallocate; + ops.fallocate = mergerfs::fuse::fallocate; #endif - ops.fgetattr = mergerfs::fgetattr::fgetattr; + ops.fgetattr = mergerfs::fuse::fgetattr; #if FLOCK ops.flock = NULL; #endif - ops.flush = mergerfs::flush::flush; - ops.fsync = mergerfs::fsync::fsync; + ops.flush = mergerfs::fuse::flush; + ops.fsync = mergerfs::fuse::fsync; ops.fsyncdir = NULL; - ops.ftruncate = mergerfs::ftruncate::ftruncate; - ops.getattr = mergerfs::getattr::getattr; + ops.ftruncate = mergerfs::fuse::ftruncate; + ops.getattr = mergerfs::fuse::getattr; ops.getdir = NULL; /* deprecated; use readdir */ - ops.getxattr = mergerfs::getxattr::getxattr; - ops.init = mergerfs::init::init; - ops.ioctl = mergerfs::ioctl::ioctl; - ops.link = mergerfs::link::link; - ops.listxattr = mergerfs::listxattr::listxattr; + ops.getxattr = mergerfs::fuse::getxattr; + ops.init = mergerfs::fuse::init; + ops.ioctl = mergerfs::fuse::ioctl; + ops.link = mergerfs::fuse::link; + ops.listxattr = mergerfs::fuse::listxattr; ops.lock = NULL; - ops.mkdir = mergerfs::mkdir::mkdir; - ops.mknod = mergerfs::mknod::mknod; - ops.open = mergerfs::open::open; - ops.opendir = mergerfs::opendir::opendir; + ops.mkdir = mergerfs::fuse::mkdir; + ops.mknod = mergerfs::fuse::mknod; + ops.open = mergerfs::fuse::open; + ops.opendir = mergerfs::fuse::opendir; ops.poll = NULL; - ops.read = mergerfs::read::read; + ops.read = mergerfs::fuse::read; #if READ_BUF - ops.read_buf = mergerfs::read_buf::read_buf; + ops.read_buf = mergerfs::fuse::read_buf; #endif - ops.readdir = mergerfs::readdir::readdir; - ops.readlink = mergerfs::readlink::readlink; - ops.release = mergerfs::release::release; - ops.releasedir = mergerfs::releasedir::releasedir; - ops.removexattr = mergerfs::removexattr::removexattr; - ops.rename = mergerfs::rename::rename; - ops.rmdir = mergerfs::rmdir::rmdir; - ops.setxattr = mergerfs::setxattr::setxattr; - ops.statfs = mergerfs::statfs::statfs; - ops.symlink = mergerfs::symlink::symlink; - ops.truncate = mergerfs::truncate::truncate; - ops.unlink = mergerfs::unlink::unlink; + ops.readdir = mergerfs::fuse::readdir; + ops.readlink = mergerfs::fuse::readlink; + ops.release = mergerfs::fuse::release; + ops.releasedir = mergerfs::fuse::releasedir; + ops.removexattr = mergerfs::fuse::removexattr; + ops.rename = mergerfs::fuse::rename; + ops.rmdir = mergerfs::fuse::rmdir; + ops.setxattr = mergerfs::fuse::setxattr; + ops.statfs = mergerfs::fuse::statfs; + ops.symlink = mergerfs::fuse::symlink; + ops.truncate = mergerfs::fuse::truncate; + ops.unlink = mergerfs::fuse::unlink; ops.utime = NULL; /* deprecated; use utimens() */ - ops.utimens = mergerfs::utimens::utimens; - ops.write = mergerfs::write::write; + ops.utimens = mergerfs::fuse::utimens; + ops.write = mergerfs::fuse::write; #if WRITE_BUF - ops.write_buf = mergerfs::write_buf::write_buf; + ops.write_buf = mergerfs::fuse::write_buf; #endif return; diff --git a/src/mkdir.cpp b/src/mkdir.cpp index 9edce6c4..35fb91dd 100644 --- a/src/mkdir.cpp +++ b/src/mkdir.cpp @@ -88,7 +88,7 @@ _mkdir(Policy::Func::Search searchFunc, namespace mergerfs { - namespace mkdir + namespace fuse { int mkdir(const char *fusepath, diff --git a/src/mkdir.hpp b/src/mkdir.hpp index 2ddc5644..53cce0c7 100644 --- a/src/mkdir.hpp +++ b/src/mkdir.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace mkdir + namespace fuse { int mkdir(const char *fusepath, diff --git a/src/mknod.cpp b/src/mknod.cpp index b8b41f5a..c63bfa39 100644 --- a/src/mknod.cpp +++ b/src/mknod.cpp @@ -90,7 +90,7 @@ _mknod(Policy::Func::Search searchFunc, namespace mergerfs { - namespace mknod + namespace fuse { int mknod(const char *fusepath, diff --git a/src/mknod.hpp b/src/mknod.hpp index e891d9b2..06bd1111 100644 --- a/src/mknod.hpp +++ b/src/mknod.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace mknod + namespace fuse { int mknod(const char *fusepath, diff --git a/src/open.cpp b/src/open.cpp index 9b488372..75636f6b 100644 --- a/src/open.cpp +++ b/src/open.cpp @@ -68,7 +68,7 @@ _open(Policy::Func::Search searchFunc, namespace mergerfs { - namespace open + namespace fuse { int open(const char *fusepath, diff --git a/src/open.hpp b/src/open.hpp index 7eaefd7b..07d002d2 100644 --- a/src/open.hpp +++ b/src/open.hpp @@ -26,7 +26,7 @@ namespace mergerfs { - namespace open + namespace fuse { int open(const char *fusepath, diff --git a/src/opendir.cpp b/src/opendir.cpp index fb3fd25b..9a20f5e6 100644 --- a/src/opendir.cpp +++ b/src/opendir.cpp @@ -26,7 +26,7 @@ namespace mergerfs { - namespace opendir + namespace fuse { int opendir(const char *fusepath, diff --git a/src/opendir.hpp b/src/opendir.hpp index 5110cc36..e5bf6193 100644 --- a/src/opendir.hpp +++ b/src/opendir.hpp @@ -26,7 +26,7 @@ namespace mergerfs { - namespace opendir + namespace fuse { int opendir(const char *fusepath, diff --git a/src/read.cpp b/src/read.cpp index 107ec58f..bb9fbc10 100644 --- a/src/read.cpp +++ b/src/read.cpp @@ -46,7 +46,7 @@ _read(const int fd, namespace mergerfs { - namespace read + namespace fuse { int read(const char *fusepath, diff --git a/src/read.hpp b/src/read.hpp index b3cf9dcc..f146f9e5 100644 --- a/src/read.hpp +++ b/src/read.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace read + namespace fuse { int read(const char *fusepath, diff --git a/src/read_buf.cpp b/src/read_buf.cpp index ac79d4a8..e7f7cca6 100644 --- a/src/read_buf.cpp +++ b/src/read_buf.cpp @@ -56,7 +56,7 @@ _read_buf(const int fd, namespace mergerfs { - namespace read_buf + namespace fuse { int read_buf(const char *fusepath, diff --git a/src/read_buf.hpp b/src/read_buf.hpp index 5b11fa5a..1ec4021a 100644 --- a/src/read_buf.hpp +++ b/src/read_buf.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace read_buf + namespace fuse { int read_buf(const char *fusepath, diff --git a/src/readdir.cpp b/src/readdir.cpp index 96c8b06d..7892a20c 100644 --- a/src/readdir.cpp +++ b/src/readdir.cpp @@ -87,7 +87,7 @@ _readdir(const vector &srcmounts, namespace mergerfs { - namespace readdir + namespace fuse { int readdir(const char *fusepath, diff --git a/src/readdir.hpp b/src/readdir.hpp index 94994fd8..395337d4 100644 --- a/src/readdir.hpp +++ b/src/readdir.hpp @@ -36,7 +36,7 @@ namespace mergerfs { - namespace readdir + namespace fuse { int readdir(const char *fusepath, diff --git a/src/readlink.cpp b/src/readlink.cpp index 1a413573..99ce4bfa 100644 --- a/src/readlink.cpp +++ b/src/readlink.cpp @@ -68,7 +68,7 @@ _readlink(Policy::Func::Search searchFunc, namespace mergerfs { - namespace readlink + namespace fuse { int readlink(const char *fusepath, diff --git a/src/readlink.hpp b/src/readlink.hpp index 82740545..663a34aa 100644 --- a/src/readlink.hpp +++ b/src/readlink.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace readlink + namespace fuse { int readlink(const char *fusepath, diff --git a/src/release.cpp b/src/release.cpp index 9bf29d0e..2fb58f2f 100644 --- a/src/release.cpp +++ b/src/release.cpp @@ -42,7 +42,7 @@ _release(uint64_t &fh) namespace mergerfs { - namespace release + namespace fuse { int release(const char *fusepath, diff --git a/src/release.hpp b/src/release.hpp index 95db9865..fee3aecc 100644 --- a/src/release.hpp +++ b/src/release.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace release + namespace fuse { int release(const char *fusepath, diff --git a/src/releasedir.cpp b/src/releasedir.cpp index 689fec7b..179eb6cf 100644 --- a/src/releasedir.cpp +++ b/src/releasedir.cpp @@ -26,7 +26,7 @@ namespace mergerfs { - namespace releasedir + namespace fuse { int releasedir(const char *fusepath, diff --git a/src/releasedir.hpp b/src/releasedir.hpp index 44a156d1..61df8f64 100644 --- a/src/releasedir.hpp +++ b/src/releasedir.hpp @@ -26,7 +26,7 @@ namespace mergerfs { - namespace releasedir + namespace fuse { int releasedir(const char *fusepath, diff --git a/src/removexattr.cpp b/src/removexattr.cpp index ff8d8853..ae8bc4ad 100644 --- a/src/removexattr.cpp +++ b/src/removexattr.cpp @@ -75,7 +75,7 @@ _removexattr(Policy::Func::Action actionFunc, namespace mergerfs { - namespace removexattr + namespace fuse { int removexattr(const char *fusepath, diff --git a/src/removexattr.hpp b/src/removexattr.hpp index 93aacae5..3a8c1393 100644 --- a/src/removexattr.hpp +++ b/src/removexattr.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace removexattr + namespace fuse { int removexattr(const char *fusepath, diff --git a/src/rename.cpp b/src/rename.cpp index 89f0860c..7864ec20 100644 --- a/src/rename.cpp +++ b/src/rename.cpp @@ -107,7 +107,7 @@ _rename(Policy::Func::Search searchFunc, namespace mergerfs { - namespace rename + namespace fuse { int rename(const char *oldpath, diff --git a/src/rename.hpp b/src/rename.hpp index 9749e8ad..b33a8e74 100644 --- a/src/rename.hpp +++ b/src/rename.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace rename + namespace fuse { int rename(const char *from, diff --git a/src/rmdir.cpp b/src/rmdir.cpp index 5be43959..c6690888 100644 --- a/src/rmdir.cpp +++ b/src/rmdir.cpp @@ -68,7 +68,7 @@ _rmdir(Policy::Func::Action actionFunc, namespace mergerfs { - namespace rmdir + namespace fuse { int rmdir(const char *fusepath) diff --git a/src/rmdir.hpp b/src/rmdir.hpp index 1713e0c9..ef469b4f 100644 --- a/src/rmdir.hpp +++ b/src/rmdir.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace rmdir + namespace fuse { int rmdir(const char *fusepath); diff --git a/src/setxattr.cpp b/src/setxattr.cpp index 2084e73a..0075d0e3 100644 --- a/src/setxattr.cpp +++ b/src/setxattr.cpp @@ -298,7 +298,7 @@ _setxattr(Policy::Func::Action actionFunc, } namespace mergerfs { - namespace setxattr + namespace fuse { int setxattr(const char *fusepath, diff --git a/src/setxattr.hpp b/src/setxattr.hpp index 88d0ed04..c528d713 100644 --- a/src/setxattr.hpp +++ b/src/setxattr.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace setxattr + namespace fuse { int setxattr(const char *fusepath, diff --git a/src/statfs.cpp b/src/statfs.cpp index 5aab37ed..2d238fe4 100644 --- a/src/statfs.cpp +++ b/src/statfs.cpp @@ -118,7 +118,7 @@ _statfs(const vector &srcmounts, namespace mergerfs { - namespace statfs + namespace fuse { int statfs(const char *fusepath, diff --git a/src/statfs.hpp b/src/statfs.hpp index 79fcff2f..2ee70484 100644 --- a/src/statfs.hpp +++ b/src/statfs.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace statfs + namespace fuse { int statfs(const char *fusepath, diff --git a/src/symlink.cpp b/src/symlink.cpp index defffce2..b8f5f8b6 100644 --- a/src/symlink.cpp +++ b/src/symlink.cpp @@ -71,7 +71,7 @@ _symlink(Policy::Func::Create createFunc, namespace mergerfs { - namespace symlink + namespace fuse { int symlink(const char *oldpath, diff --git a/src/symlink.hpp b/src/symlink.hpp index 63a601cb..942cc169 100644 --- a/src/symlink.hpp +++ b/src/symlink.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace symlink + namespace fuse { int symlink(const char *oldpath, diff --git a/src/truncate.cpp b/src/truncate.cpp index d7ae5cf5..86933998 100644 --- a/src/truncate.cpp +++ b/src/truncate.cpp @@ -71,7 +71,7 @@ _truncate(Policy::Func::Action actionFunc, namespace mergerfs { - namespace truncate + namespace fuse { int truncate(const char *fusepath, diff --git a/src/truncate.hpp b/src/truncate.hpp index a0994f9d..617780e9 100644 --- a/src/truncate.hpp +++ b/src/truncate.hpp @@ -26,7 +26,7 @@ namespace mergerfs { - namespace truncate + namespace fuse { int truncate(const char *fusepath, diff --git a/src/unlink.cpp b/src/unlink.cpp index 5b4537ce..1dbfa690 100644 --- a/src/unlink.cpp +++ b/src/unlink.cpp @@ -69,7 +69,7 @@ _unlink(Policy::Func::Action actionFunc, namespace mergerfs { - namespace unlink + namespace fuse { int unlink(const char *fusepath) diff --git a/src/unlink.hpp b/src/unlink.hpp index 5f6bf2c7..a4fc126d 100644 --- a/src/unlink.hpp +++ b/src/unlink.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace unlink + namespace fuse { int unlink(const char *fusepath); diff --git a/src/utimens.cpp b/src/utimens.cpp index e623a3d5..2bdbfeed 100644 --- a/src/utimens.cpp +++ b/src/utimens.cpp @@ -71,7 +71,7 @@ _utimens(Policy::Func::Action actionFunc, namespace mergerfs { - namespace utimens + namespace fuse { int utimens(const char *fusepath, diff --git a/src/utimens.hpp b/src/utimens.hpp index ff45ffd9..61af02fc 100644 --- a/src/utimens.hpp +++ b/src/utimens.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace utimens + namespace fuse { int utimens(const char *fusepath, diff --git a/src/write.cpp b/src/write.cpp index 2cf42058..68faf2ef 100644 --- a/src/write.cpp +++ b/src/write.cpp @@ -43,7 +43,7 @@ _write(const int fd, namespace mergerfs { - namespace write + namespace fuse { int write(const char *fusepath, diff --git a/src/write.hpp b/src/write.hpp index 05abb0fb..b4706baf 100644 --- a/src/write.hpp +++ b/src/write.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace write + namespace fuse { int write(const char *fusepath, diff --git a/src/write_buf.cpp b/src/write_buf.cpp index 139d4d77..07bc3e06 100644 --- a/src/write_buf.cpp +++ b/src/write_buf.cpp @@ -50,7 +50,7 @@ _write_buf(const int fd, namespace mergerfs { - namespace write_buf + namespace fuse { int write_buf(const char *fusepath, diff --git a/src/write_buf.hpp b/src/write_buf.hpp index bce2de84..d539c2b8 100644 --- a/src/write_buf.hpp +++ b/src/write_buf.hpp @@ -24,7 +24,7 @@ namespace mergerfs { - namespace write_buf + namespace fuse { int write_buf(const char *fusepath,