Merge pull request #281 from trapexit/update-man

update man page
2026-10-20 00:17:43 +00:00 · 2016-05-19 17:30:07 -04:00 · 2016-05-19 17:28:37 -04:00 · 2016-05-17 16:09:38 -04:00 · 2016-05-17 16:09:22 -04:00 · 2016-05-11 13:23:33 -04:00
156 changed files with 4806 additions and 4591 deletions
@@ -12,6 +12,14 @@
 *.la
 *.a

+# build artifacts
+mergerfs
+obj/
+src/version.hpp
+
 # Debian files
 debian/files
 debian/changelog
+
+# RPM files
+rpmbuild/
@@ -1,23 +1,15 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
@@ -1,24 +1,17 @@
-# The MIT License (MIT)
+#  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>
 #
-# Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+#  Permission to use, copy, modify, and/or distribute this software for any
+#  purpose with or without fee is hereby granted, provided that the above
+#  copyright notice and this permission notice appear in all copies.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+#  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+#  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+#  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+#  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+#  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+#  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

 PKGCONFIG =  	$(shell which pkg-config)
 GIT 	  = 	$(shell which git)
@@ -106,7 +99,7 @@ $(warning "xattr not available: disabling")
 CFLAGS += -DWITHOUT_XATTR
 endif

-all: $(TARGET) clone
+all: $(TARGET)

 help:
 	@echo "usage: make"
@@ -115,11 +108,6 @@ help:
 $(TARGET): src/version.hpp obj/obj-stamp $(OBJ)
 	$(CXX) $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS)

-clone: $(TARGET)
-	$(LN) -fs "$<" "$@"
-
-fsck.mergerfs: tools/fsck.mergerfs
-
 mount.mergerfs: $(TARGET)
 	$(LN) -fs "$<" "$@"

@@ -146,50 +134,41 @@ obj/%.o: src/%.cpp
 clean: rpm-clean
 	$(RM) -rf obj
 	$(RM) -f src/version.hpp
-	$(RM) -f "$(TARGET)" "$(MANPAGE)" clone
+	$(RM) -f "$(TARGET)" mount.mergerfs
 	$(FIND) . -name "*~" -delete

 distclean: clean
 	$(GIT) clean -fd

-install: install-base install-clone install-mount.mergerfs install-tools install-man
+install: install-base install-mount.mergerfs install-man

 install-base: $(TARGET)
 	$(INSTALL) -v -m 0755 -D "$(TARGET)" "$(INSTALLBINDIR)/$(TARGET)"

-install-clone: clone
-	$(MKDIR) -p "$(INSTALLBINDIR)"
-	$(CP) -a "$<" "$(INSTALLBINDIR)/$<"
-
 install-mount.mergerfs: mount.mergerfs
 	$(MKDIR) -p "$(INSTALLBINDIR)"
 	$(CP) -a "$<" "$(INSTALLBINDIR)/$<"

-install-tools: fsck.mergerfs
-	$(INSTALL) -v -m 0755 -D "tools/$<" "$(INSTALLSBINDIR)/$<"
-
 install-man: $(MANPAGE)
-	$(INSTALL) -v -m 0644 -D "$(MANPAGE)" "$(INSTALLMAN1DIR)/$(MANPAGE)"
+	$(INSTALL) -v -m 0644 -D "man/$(MANPAGE)" "$(INSTALLMAN1DIR)/$(MANPAGE)"

 install-strip: install-base
 	$(STRIP) "$(INSTALLBINDIR)/$(TARGET)"

-uninstall: uninstall-base uninstall-clone uninstall-man
+uninstall: uninstall-base uninstall-mount.mergerfs uninstall-man

 uninstall-base:
 	$(RM) -f "$(INSTALLBINDIR)/$(TARGET)"

-uninstall-clone:
-	$(RM) -f "$(INSTALLBINDIR)/clone"
+uninstall-mount.mergerfs:
+	$(RM) -f "$(INSTALLBINDIR)/mount.mergerfs"

 uninstall-man:
 	$(RM) -f "$(INSTALLMAN1DIR)/$(MANPAGE)"

 $(MANPAGE): README.md
 ifneq (,$(PANDOC))
-	$(PANDOC) -s -t man -o $(MANPAGE) README.md
-else
-	$(CP) man/mergerfs.1 .
+	$(PANDOC) -s -t man -o "man/$(MANPAGE)" README.md
 endif

 man: $(MANPAGE)
@@ -219,7 +198,7 @@ rpm-clean:
 rpm: tarball
 	$(eval VERSION := $(shell $(GIT) describe --always --tags --dirty))
 	$(eval VERSION := $(subst -,_,$(VERSION)))
-	$(MKDIR) -p rpmbuild/{BUILD,RPMS,SOURCES}
+	$(MKDIR) -p rpmbuild/BUILD rpmbuild/RPMS rpmbuild/SOURCES
 	$(SED) 's/__VERSION__/$(VERSION)/g' $(TARGET).spec > \
 		rpmbuild/SOURCES/$(TARGET).spec
 	cp -ar $(TARGET)-$(VERSION).tar.gz rpmbuild/SOURCES
@@ -1,31 +1,31 @@
 % mergerfs(1) mergerfs user manual
 % Antonio SJ Musumeci <trapexit@spawn.link>
-% 2015-10-11
+% 2016-05-17

 # NAME

-mergerfs - another FUSE union filesystem
+mergerfs - another (FUSE based) union filesystem

 # SYNOPSIS

-mergerfs -o&lt;options&gt; &lt;srcpoints&gt; &lt;mountpoint&gt;
+mergerfs -o&lt;options&gt; &lt;srcmounts&gt; &lt;mountpoint&gt;

 # DESCRIPTION

-**mergerfs** is similar to **mhddfs**, **unionfs**, and **aufs**. Like **mhddfs** in that it too uses **FUSE**. Like **aufs** in that it provides multiple policies for how to handle behavior.
-
-Why **mergerfs** when those exist? **mhddfs** has not been updated in some time nor very flexible. There are also security issues when with running as root. **aufs** is more flexible than **mhddfs** but kernel based and difficult to debug when problems arise. Neither support file attributes ([chattr](http://linux.die.net/man/1/chattr)).
+**mergerfs** is a union filesystem geared towards simplifing storage and management of files across numerous commodity storage devices. It is similar to **mhddfs**, **unionfs**, and **aufs**.

 # FEATURES

 * Runs in userspace (FUSE)
 * Configurable behaviors
-* Supports extended attributes (xattrs)
-* Supports file attributes (chattr)
-* Dynamically configurable (via xattrs)
+* Support for extended attributes (xattrs)
+* Support for file attributes (chattr)
+* Runtime configurable (via xattrs)
 * Safe to run as root
 * Opportunistic credential caching
 * Works with heterogeneous filesystem types
+* Handling of writes to full drives
+* Handles pool of readonly and read/write drives

 # OPTIONS

@@ -33,37 +33,44 @@ Why **mergerfs** when those exist? **mhddfs** has not been updated in some time

 * **defaults**: a shortcut for FUSE's **atomic_o_trunc**, **auto_cache**, **big_writes**, **default_permissions**, **splice_move**, **splice_read**, and **splice_write**. These options seem to provide the best performance.
 * **direct_io**: causes FUSE to bypass an addition caching step which can increase write speeds at the detriment of read speed. 
-* **minfreespace**: the minimum space value used for the **lfs**, **fwfs**, and **epmfs** policies. Understands 'K', 'M', and 'G' to represent kilobyte, megabyte, and gigabyte respectively. (default: 4G)
+* **minfreespace**: the minimum space value used for creation policies. Understands 'K', 'M', and 'G' to represent kilobyte, megabyte, and gigabyte respectively. (default: 4G)
 * **moveonenospc**: when enabled (set to **true**) if a **write** fails with **ENOSPC** a scan of all drives will be done looking for the drive with most free space which is at least the size of the file plus the amount which failed to write. An attempt to move the file to that drive will occur (keeping all metadata possible) and if successful the original is unlinked and the write retried. (default: false)
 * **func.&lt;func&gt;=&lt;policy&gt;**: sets the specific FUSE function's policy. See below for the list of value types. Example: **func.getattr=newest**
 * **category.&lt;category&gt;=&lt;policy&gt;**: Sets policy of all FUSE functions in the provided category. Example: **category.create=mfs**
+* **fsname**: sets the name of the filesystem as seen in **mount**, **df**, etc. Defaults to a list of the source paths concatenated together with the longest common prefix removed.

 **NOTE:** Options are evaluated in the order listed so if the options are **func.rmdir=rand,category.action=ff** the **action** category setting will override the **rmdir** setting.

-###srcpoints###
+###srcmounts###

-The source points argument is a colon (':') delimited list of paths. To make it simpler to include multiple source points without having to modify your [fstab](http://linux.die.net/man/5/fstab) we also support [globbing](http://linux.die.net/man/7/glob). **The globbing tokens MUST be escaped when using via the shell else the shell itself will probably expand it.**
+The srcmounts (source mounts) argument is a colon (':') delimited list of paths to be included in the pool. It does not matter if the paths are on the same or different drives nor does it matter the filesystem. Used and available space will not be duplicated for paths on the same device and any features which aren't supported by the underlying filesystem (such as file attributes or extended attributes) will return the appropriate errors.
+
+To make it easier to include multiple source mounts mergerfs supports [globbing](http://linux.die.net/man/7/glob). **The globbing tokens MUST be escaped when using via the shell else the shell itself will expand it.**

 ```
-$ mergerfs /mnt/disk\*:/mnt/cdrom /media/drives
+$ mergerfs -o defaults,allow_other /mnt/disk\*:/mnt/cdrom /media/drives
 ```

-The above line will use all points in /mnt prefixed with *disk* and the directory *cdrom*.
+The above line will use all mount points in /mnt prefixed with **disk** and the **cdrom**.

-In /etc/fstab it'd look like the following:
+To have the pool mounted at boot or otherwise accessable from related tools use **/etc/fstab**.

 ```
 # <file system>        <mount point>  <type>         <options>             <dump>  <pass>
 /mnt/disk*:/mnt/cdrom  /media/drives  fuse.mergerfs  defaults,allow_other  0       0
 ```

-**NOTE:** the globbing is done at mount or xattr update time. If a new directory is added matching the glob after the fact it will not be included.
+**NOTE:** the globbing is done at mount or xattr update time (see below). If a new directory is added matching the glob after the fact it will not be automatically included.

-# POLICIES
+**NOTE:** for mounting via **fstab** to work you must have **mount.fuse** installed. For Ubuntu/Debian it is included in the **fuse** package.

-Filesystem calls are broken up into 3 categories: **action**, **create**, **search**. There are also some calls which have no policy attached due to state being kept between calls. These categories can be assigned a policy which dictates how **mergerfs** behaves. Any policy can be assigned to a category though some aren't terribly practical. For instance: **rand** (Random) may be useful for **create** but could lead to very odd behavior if used for **search**.
+# FUNCTIONS / POLICIES / CATEGORIES

-#### Functional  classifications ####
+The POSIX filesystem API has a number of functions. **creat**, **stat**, **chown**, etc. In mergerfs these functions are grouped into 3 categories: **action**, **create**, and **search**. Functions and categories can be assigned a policy which dictates how **mergerfs** behaves. Any policy can be assigned to a function or category though some are not very practical. For instance: **rand** (random) may be useful for file creation (create) but could lead to very odd behavior if used for `chmod` (though only if there were more than one copy of the file).
+
+Policies, when called to create, will ignore drives which are readonly or have less than **minfreespace**. This allows for read/write and readonly drives to be mixed together and keep drives which may remount as readonly on error from further affecting the pool.
+
+#### Function / Category classifications ####

 | Category | FUSE Functions |
 |----------|----------------|
@@ -72,22 +79,23 @@ Filesystem calls are broken up into 3 categories: **action**, **create**, **sear
 | search   | access, getattr, getxattr, ioctl, listxattr, open, readlink |
 | N/A      | fallocate, fgetattr, fsync, ftruncate, ioctl, read, readdir, release, statfs, write |

-**ioctl** behaves differently if its acting on a directory. It'll use the **getattr** policy to find and open the directory before issuing the **ioctl**. In other cases where something may be searched (to confirm a directory exists across all source mounts) then **getattr** will be used.
+Due to FUSE limitations **ioctl** behaves differently if its acting on a directory. It'll use the **getattr** policy to find and open the directory before issuing the **ioctl**. In other cases where something may be searched (to confirm a directory exists across all source mounts) **getattr** will also be used.

 #### Policy descriptions ####

 | Policy | Description |
 |--------------|-------------|
-| ff (first found) | Given the order of the drives act on the first one found (regardless if stat would return EACCES). |
-| ffwp (first found w/ permissions) | Given the order of the drives act on the first one found which you have access (stat does not error with EACCES). |
-| newest (newest file) | If multiple files exist return the one with the most recent mtime. |
-| mfs (most free space) | Use the drive with the most free space available. |
-| epmfs (existing path, most free space) | If the path exists on multiple drives use the one with the most free space and is greater than **minfreespace**. If no drive has at least **minfreespace** then fallback to **mfs**. |
-| fwfs (first with free space) | Pick the first drive which has at least **minfreespace**. |
-| lfs (least free space) | Pick the drive with least available space but more than **minfreespace**. |
-| rand (random) | Pick an existing drive at random. |
-| all | Applies action to all found. For searches it will behave like first found **ff**. |
-| enosys, einval, enotsup, exdev, erofs | Exclusively return `-1` with `errno` set to the respective value. Useful for debugging other applications' behavior to errors. |
+| all | Search category: acts like **ff**. Action category: apply to all found. Create category: for **mkdir**, **mknod**, and **symlink** it will apply to all found. **create** works like **ff**. It will exclude readonly drives and those with free space less than **minfreespace**. |
+| eplfs (existing path, least free space) | If the path exists on multiple drives use the one with the least free space. For **create** category it will exclude readonly drives and those with free space less than **minfreespace**. Falls back to **lfs**. |
+| eplus (existing path, least used space) | If the path exists on multiple drives the the one with the least used space. For **create** category it will exclude readonly drives and those with free space less than **minfreespace**. Falls back to **lus**. |
+| epmfs (existing path, most free space) | If the path exists on multiple drives use the one with the most free space. For **create** category it will exclude readonly drives and those with free space less than **minfreespace**. Falls back to **mfs**. |
+| erofs | Exclusively return **-1** with **errno** set to **EROFS**. By setting **create** functions to this you can in effect turn the filesystem readonly. |
+| ff (first found) | Given the order of the drives, as defined at mount time or when configured via xattr interface, act on the first one found. For **create** category it will exclude readonly drives and those with free space less than **minfreespace** (unless there is no other option). |
+| lfs (least free space) | Pick the drive with the least available free space. For **create** category it will exclude readonly drives and those with free space less than **minfreespace**. Falls back to **mfs**. |
+| lus (least used space) | Pick the drive with the least used space. For **create** category it will exclude readonly drives and those with free space less than **minfreespace**. Falls back to **mfs**. |
+| mfs (most free space) | Pick the drive with the most available free space. For **create** category it will exclude readonly drives and those with free space less than **minfreespace**. Falls back to **ff**. |
+| newest (newest file) | Pick the file / directory with the largest mtime. For **create** category it will exclude readonly drives and those with free space less than **minfreespace** (unless there is no other option). |
+| rand (random) | Calls **all** and then randomizes. |

 #### Defaults ####

@@ -97,21 +105,49 @@ Filesystem calls are broken up into 3 categories: **action**, **create**, **sear
 | create   | epmfs  |
 | search   | ff     |

-#### rename ####
+#### rename & link ####

-[rename](http://man7.org/linux/man-pages/man2/rename.2.html) is a tricky function in a merged system. Normally if a rename can't be done atomically due to the from and to paths existing on different mount points it will return `-1` with `errno = EXDEV`. The atomic rename is most critical for replacing files in place atomically (such as securing writing to a temp file and then replacing a target). The problem is that by merging multiple paths you can have N instances of the source and destinations on different drives. Meaning that if you just renamed each source locally you could end up with the destination files not overwriten / replaced. To address this mergerfs works in the following way. If the source and destination exist in different directories it will immediately return `EXDEV`. Generally it's not expected for cross directory renames to work so it should be fine for most instances (mv,rsync,etc.). If they do belong to the same directory it then runs the `rename` policy to get the files to rename. It iterates through and renames each file while keeping track of those paths which have not been renamed. If all the renames succeed it will then `unlink` or `rmdir` the other paths to clean up any preexisting target files. This allows the new file to be found without the file itself ever disappearing. There may still be some issues with this behavior. Particularly on error. At the moment however this seems the best policy.
+[rename](http://man7.org/linux/man-pages/man2/rename.2.html) is a tricky function in a merged system. Normally if a rename can't be done atomically due to the source and destination paths existing on different mount points it will return **-1** with **errno = EXDEV**. The atomic rename is most critical for replacing files in place atomically (such as securing writing to a temp file and then replacing a target). The problem is that by merging multiple paths you can have N instances of the source and destinations on different drives. This can lead to several undesirable situtations with or without errors and it's not entirely obvious what to do when an error occurs.
+
+Originally mergerfs would return EXDEV whenever a rename was requested which was cross directory in any way. This made the code simple and was technically complient with POSIX requirements. However, many applications fail to handle EXDEV at all and treat it as a normal error or they only partially support EXDEV (don't respond the same as `mv` would). Such apps include: gvfsd-fuse v1.20.3 and prior, Finder / CIFS/SMB client in Apple OSX 10.9+, NZBGet, Samba's recycling bin feature.
+
+* If using a **create** policy which tries to preserve directory paths (epmfs,eplfs)
+  * Using the **rename** policy get the list of files to rename
+  * For each file attempt rename:
+    * If failure with ENOENT run **create** policy
+    * If create policy returns the same drive as currently evaluating then clone the path
+    * Re-attempt rename
+  * If **any** of the renames succeed the higher level rename is considered a success
+  * If **no** renames succeed the first error encountered will be returned
+  * On success:
+    * Remove the target from all drives with no source file
+    * Remove the source from all drives which failed to rename
+* If using a **create** policy which does **not** try to preserve directory paths
+  * Using the **rename** policy get the list of files to rename
+  * Using the **getattr** policy get the target path
+  * For each file attempt rename:
+    * If the source drive != target drive:
+      * Clone target path from target drive to source drive
+    * Rename
+  * If **any** of the renames succeed the higher level rename is considered a success
+  * If **no** renames succeed the first error encountered will be returned
+  * On success:
+    * Remove the target from all drives with no source file
+    * Remove the source from all drives which failed to rename
+
+The the removals are subject to normal entitlement checks.
+
+The above behavior will help minimize the likelihood of EXDEV being returned but it will still be possible. To remove the possibility all together mergerfs would need to perform the as **mv** does when it receives EXDEV normally.
+
+**link** uses the same basic strategy.

 #### readdir ####

-[readdir](http://linux.die.net/man/3/readdir) is very different from most functions in this realm. It certainly could have it's own set of policies to tweak its behavior. At this time it provides a simple **first found** merging of directories and file found. That is: only the first file or directory found for a directory is returned. Given how FUSE works though the data representing the returned entry comes from **getattr**.
-
-It could be extended to offer the ability to see all files found. Perhaps concatenating **#** and a number to the name. But to really be useful you'd need to be able to access them which would complicate file lookup.
+[readdir](http://linux.die.net/man/3/readdir) is different from all other filesystem functions. While it could have it's own set of policies to tweak its behavior at this time it provides a simple union of files and directories found. Remember that any action or information queried about these files and directories come from the respective function. For instance: an **ls** is a **readdir** and for each file/directory returned **getattr** is called. Meaning the policy of **getattr** is responsible for choosing the file/directory which is the source of the metadata you see in an **ls**.

 #### statvfs ####

-[statvfs](http://linux.die.net/man/2/statvfs) normalizes the source drives based on the fragment size and sums the number of adjusted blocks and inodes. This means you will see the combined space of all sources. Total, used, and free. The sources however are dedupped based on the drive so multiple points on the same drive will not result in double counting it's space.
-
-**NOTE:** Since we can not (easily) replicate the atomicity of an **mkdir** or **mknod** without side effects those calls will first do a scan to see if the file exists and then attempts a create. This means there is a slight race condition. Worse case you'd end up with the directory or file on more than one mount.
+[statvfs](http://linux.die.net/man/2/statvfs) normalizes the source drives based on the fragment size and sums the number of adjusted blocks and inodes. This means you will see the combined space of all sources. Total, used, and free. The sources however are dedupped based on the drive so multiple sources on the same drive will not result in double counting it's space.

 # BUILDING

@@ -122,12 +158,12 @@ First get the code from [github](http://github.com/trapexit/mergerfs).
 ```
 $ git clone https://github.com/trapexit/mergerfs.git
 $ # or
-$ wget https://github.com/trapexit/mergerfs/archive/master.zip
+$ wget https://github.com/trapexit/mergerfs/releases/download/<ver>/mergerfs-<ver>.tar.gz
 ```

 #### Debian / Ubuntu
 ```
-$ sudo apt-get install g++ pkg-config git git-buildpackage pandoc debhelper libfuse-dev libattr1-dev
+$ sudo apt-get install g++ pkg-config git git-buildpackage pandoc debhelper libfuse-dev libattr1-dev python
 $ cd mergerfs
 $ make deb
 $ sudo dpkg -i ../mergerfs_version_arch.deb
@@ -136,7 +172,7 @@ $ sudo dpkg -i ../mergerfs_version_arch.deb
 #### Fedora
 ```
 $ su -
-# dnf install rpm-build fuse-devel libattr-devel pandoc gcc-c++ git make which
+# dnf install rpm-build fuse-devel libattr-devel pandoc gcc-c++ git make which python
 # cd mergerfs
 # make rpm
 # rpm -i rpmbuild/RPMS/<arch>/mergerfs-<verion>.<arch>.rpm
@@ -144,7 +180,7 @@ $ su -

 #### Generically

-Have pkg-config, pandoc, libfuse, libattr1 installed.
+Have git, python, pkg-config, pandoc, libfuse, libattr1 installed.

 ```
 $ cd mergerfs
@@ -162,11 +198,44 @@ $ sudo make install

 There is a pseudo file available at the mount point which allows for the runtime modification of certain **mergerfs** options. The file will not show up in **readdir** but can be **stat**'ed and manipulated via [{list,get,set}xattrs](http://linux.die.net/man/2/listxattr) calls.

-Even if xattrs are disabled the [{list,get,set}xattrs](http://linux.die.net/man/2/listxattr) calls will still work.
+Even if xattrs are disabled for mergerfs the [{list,get,set}xattrs](http://linux.die.net/man/2/listxattr) calls against this pseudo file will still work.
+
+Any changes made at runtime are **not** persisted. If you wish for values to persist they must be included as options wherever you configure the mounting of mergerfs (fstab).

 ##### Keys #####

-Use `xattr -l /mount/point/.mergerfs` to see all supported keys.
+Use `xattr -l /mount/point/.mergerfs` to see all supported keys. Some are informational and therefore readonly.
+
+###### user.mergerfs.srcmounts ######
+
+Used to query or modify the list of source mounts. When modifying there are several shortcuts to easy manipulation of the list.
+
+| Value        | Description |
+|--------------|-------------|
+| [list]       | set         |
+| +<[list]     | prepend     |
+| +>[list]     | append      |
+| -[list]      | remove all values provided |
+| -<           | remove first in list |
+| ->           | remove last in list |
+
+###### minfreespace ######
+
+Input: interger with an optional multiplier suffix. **K**, **M**, or **G**.
+
+Output: value in bytes
+
+###### moveonenospc ######
+
+Input: **true** and **false**
+
+Ouput: **true** or **false**
+
+###### categories / funcs ######
+
+Input: short policy string as described elsewhere in this document
+
+Output: the policy string except for categories where its funcs have multiple types. In that case it will be a comma separated list

 ##### Example #####

@@ -175,38 +244,14 @@ Use `xattr -l /mount/point/.mergerfs` to see all supported keys.
 user.mergerfs.srcmounts: /tmp/a:/tmp/b
 user.mergerfs.minfreespace: 4294967295
 user.mergerfs.moveonenospc: false
-user.mergerfs.policies: all,einval,enosys,enotsup,epmfs,erofs,exdev,ff,ffwp,fwfs,lfs,mfs,newest,rand
-user.mergerfs.version: x.y.z
-user.mergerfs.category.action: all
-user.mergerfs.category.create: epmfs
-user.mergerfs.category.search: ff
-user.mergerfs.func.access: ff
-user.mergerfs.func.chmod: all
-user.mergerfs.func.chown: all
-user.mergerfs.func.create: epmfs
-user.mergerfs.func.getattr: ff
-user.mergerfs.func.getxattr: ff
-user.mergerfs.func.link: all
-user.mergerfs.func.listxattr: ff
-user.mergerfs.func.mkdir: epmfs
-user.mergerfs.func.mknod: epmfs
-user.mergerfs.func.open: ff
-user.mergerfs.func.readlink: ff
-user.mergerfs.func.removexattr: all
-user.mergerfs.func.rename: all
-user.mergerfs.func.rmdir: all
-user.mergerfs.func.setxattr: all
-user.mergerfs.func.symlink: epmfs
-user.mergerfs.func.truncate: all
-user.mergerfs.func.unlink: all
-user.mergerfs.func.utimens: all
+...

 [trapexit:/tmp/mount] $ xattr -p user.mergerfs.category.search .mergerfs
 ff

-[trapexit:/tmp/mount] $ xattr -w user.mergerfs.category.search ffwp .mergerfs
+[trapexit:/tmp/mount] $ xattr -w user.mergerfs.category.search newest .mergerfs
 [trapexit:/tmp/mount] $ xattr -p user.mergerfs.category.search .mergerfs
-ffwp
+newest

 [trapexit:/tmp/mount] $ xattr -w user.mergerfs.srcmounts +/tmp/c .mergerfs
 [trapexit:/tmp/mount] $ xattr -p user.mergerfs.srcmounts .mergerfs
@@ -221,41 +266,13 @@ ffwp
 /tmp/a:/tmp/b:/tmp/c
 ```

-##### user.mergerfs.srcmounts #####
-
-For **user.mergerfs.srcmounts** there are several instructions available for manipulating the list. The value provided is just as the value used at mount time. A colon (':') delimited list of full path globs.
-
-| Instruction | Description |
-|--------------|-------------|
-| [list]       | set |
-| +<[list]     | prepend |
-| +>[list]     | append |
-| -[list]      | remove all values provided |
-| -<           | remove first in list |
-| ->           | remove last in list |
-
-##### minfreespace #####
-
-Input: interger with an optional suffix. **K**, **M**, or **G**.
-Output: value in bytes
-
-##### moveonenospc #####
-
-Input: **true** and **false**
-Ouput: **true** or **false**
-
-##### categories / funcs #####
-
-Input: short policy string as described elsewhere in this document
-Output: the policy string except for categories where its funcs have multiple types. In that case it will be a comma separated list.
-
-#### mergerfs file xattrs ####
+#### file / directory xattrs ####

 While they won't show up when using [listxattr](http://linux.die.net/man/2/listxattr) **mergerfs** offers a number of special xattrs to query information about the files served. To access the values you will need to issue a [getxattr](http://linux.die.net/man/2/getxattr) for one of the following:

-* **user.mergerfs.basepath:** the base mount point for the file given the current search policy
+* **user.mergerfs.basepath:** the base mount point for the file given the current getattr policy
 * **user.mergerfs.relpath:** the relative path of the file from the perspective of the mount point
-* **user.mergerfs.fullpath:** the full path of the original file given the search policy
+* **user.mergerfs.fullpath:** the full path of the original file given the getattr policy
 * **user.mergerfs.allpaths:** a NUL ('\0') separated list of full paths to all files found

 ```
@@ -274,50 +291,108 @@ A B C

 # TOOLING

-* /usr/sbin/fsck.mergerfs: Provides permissions and ownership auditing and the ability to fix them.
+Find tooling to help with managing **mergerfs** at: https://github.com/trapexit/mergerfs-tools
+
+* mergerfs.fsck: Provides permissions and ownership auditing and the ability to fix them
+* mergerfs.dedup: Will help identify and optionally remove duplicate files
+* mergerfs.mktrash: Creates FreeDesktop.org Trash specification compatible directories on a mergerfs mount

 # TIPS / NOTES

-* If you don't see some directories / files you expect in a merged point be sure the user has permission to all the underlying directories. If `/drive0/a` has is owned by `root:root` with ACLs set to `0700` and `/drive1/a` is `root:root` and `0755` you'll see only `/drive1/a`. Use `fsck.mergerfs` to audit the drive for out of sync permissions.
-* Since POSIX gives you only error or success on calls its difficult to determine the proper behavior when applying the behavior to multiple targets. Generally if something succeeds when reading it returns the data it can. If something fails when making an action we continue on and return the last error.
+* https://github.com/trapexit/backup-and-recovery-howtos : A set of guides / howtos on creating a data storage system, backing it up, maintaining it, and recovering from failure.
+* If you don't see some directories / files you expect in a merged point be sure the user has permission to all the underlying directories. If `/drive0/a` has is owned by `root:root` with ACLs set to `0700` and `/drive1/a` is `root:root` and `0755` you'll see only `/drive1/a`. Use `mergerfs.fsck` to audit the drive for out of sync permissions.
+* Do *not* use `direct_io` if you expect applications (such as rtorrent) to [mmap](http://linux.die.net/man/2/mmap) files. It is not currently supported in FUSE w/ `direct_io` enabled.
+* Since POSIX gives you only error or success on calls its difficult to determine the proper behavior when applying the behavior to multiple targets. **mergerfs** will return an error only if all attempts of an action fail. Any success will lead to a success returned.
 * The recommended options are **defaults,allow_other**. The **allow_other** is to allow users who are not the one which executed mergerfs access to the mountpoint. **defaults** is described above and should offer the best performance. It's possible that if you're running on an older platform the **splice** features aren't available and could error. In that case simply use the other options manually.
-* If write performance is valued more than read it may be useful to enable **direct_io**.
-* Remember that some policies mixed with some functions may result in strange behaviors. Not that some of these behaviors and race conditions couldn't happen outside **mergerfs** but that they are far more likely to occur on account of attempt to merge together multiple sources of data which could be out of sync due to the different policies.
-* An example: [Kodi](http://kodi.tv) and [Plex](http://plex.tv) can apparently use directory [mtime](http://linux.die.net/man/2/stat) to more efficiently determine whether or not to scan for new content rather than simply performing a full scan. If using the current default **getattr** policy of **ff** its possible **Kodi** will miss an update on account of it returning the first directory found's **stat** info and its a later directory on another mount which had the **mtime** recently updated. To fix this you will want to set **func.getattr=newest**. Remember though that this is just **stat**. If the file is later **open**'ed or **unlink**'ed and the policy is different for those then a completely different file or directory could be acted on.
+* If write performance is valued more than read it may be useful to enable **direct_io**. Best to benchmark with and without and choose appropriately.
+* Remember: some policies mixed with some functions may result in strange behaviors. Not that some of these behaviors and race conditions couldn't happen outside **mergerfs** but that they are far more likely to occur on account of attempt to merge together multiple sources of data which could be out of sync due to the different policies.
+* An example: [Kodi](http://kodi.tv) and [Plex](http://plex.tv) can use directory [mtime](http://linux.die.net/man/2/stat) to more efficiently determine whether to scan for new content rather than simply performing a full scan. If using the current default **getattr** policy of **ff** its possible **Kodi** will miss an update on account of it returning the first directory found's **stat** info and its a later directory on another mount which had the **mtime** recently updated. To fix this you will want to set **func.getattr=newest**. Remember though that this is just **stat**. If the file is later **open**'ed or **unlink**'ed and the policy is different for those then a completely different file or directory could be acted on.
 * Due to previously mentioned issues its generally best to set **category** wide policies rather than individual **func**'s. This will help limit the confusion of tools such as [rsync](http://linux.die.net/man/1/rsync).

-# Known Issues / Bugs
+# KNOWN ISSUES / BUGS

-#### Samba
-* Moving files or directories between directories on a SMB share fail with IO errors.    
-    
-    Workaround: Copy the file/directory and then remove the original rather than move.
-    
-    This isn't an issue with Samba but some SMB clients. GVFS-fuse v1.20.3 and prior (found in Ubuntu 14.04 among others) failed to handle certain error codes correctly. Particularly **STATUS_NOT_SAME_DEVICE** which comes from the **EXDEV** which is returned by **rename** when the call is crossing mountpoints. When a program gets an **EXDEV** it needs to explicitly take an alternate action to accomplish it's goal. In the case of **mv** or similar it tries **rename** and on **EXDEV** falls back to a manual copying of data between the two locations and unlinking the source. In these older versions of GVFS-fuse if it received **EXDEV** it would translate that into **EIO**. This would cause **mv** or most any application attempting to move files around on that SMB share to fail with a IO error.    
-    
-    [GVFS-fuse v1.22.0](https://bugzilla.gnome.org/show_bug.cgi?id=734568) and above fixed this issue but a large number of systems use the older release. On Ubuntu the version can be checked by issuing `apt-cache showpkg gvfs-fuse`. Most distros released in 2015 seem to have the updated release and will work fine but older systems may not. Upgrading gvfs-fuse or the distro in general will address the problem.
-    
-    In Apple's MacOSX 10.9 they replaced Samba (client and server) with their own product. It appears their new client does not handle **EXDEV** either and responds similar to older release of gvfs on Linux.
+#### rtorrent fails with ENODEV (No such device)

-#### Supplemental groups
-* Due to the overhead of [getgroups/setgroups](http://linux.die.net/man/2/setgroups) mergerfs utilizes a cache. This cache is opportunistic and per thread. Each thread will query the supplemental groups for a user when that particular thread needs to change credentials and will keep that data for the lifetime of the mount or thread. This means that if a user is added to a group it may not be picked up without the restart of mergerfs. However, since the high level FUSE API's (at least the standard version) thread pool dynamically grows and shrinks it's possible that over time a thread will be killed and later a new thread with no cache will start and query the new data.    
-    
-    The gid cache uses fixed storage to simplify the design and be compatible with older systems which may not have C++11 compilers (as the original design required). There is enough storage for 256 users' supplemental groups. Each user is allowed upto 32 supplemental groups. Linux >= 2.6.3 allows upto 65535 groups per user but most other *nixs allow far less. NFS allowing only 16. The system does handle overflow gracefully. If the user has more than 32 supplemental groups only the first 32 will be used. If more than 256 users are using the system when an uncached user is found it will evict an existing user's cache at random. So long as there aren't more than 256 active users this should be fine. If either value is too low for your needs you will have to modify `gidcache.hpp` to increase the values. Note that doing so will increase the memory needed by each thread.
+Be sure to turn off `direct_io`. rtorrent and some other applications use [mmap](http://linux.die.net/man/2/mmap) to read and write to files and offer no failback to traditional methods. FUSE does not currently support mmap while using `direct_io`. There will be a performance penalty on writes with `direct_io` off but it's the only way to get such applications to work. If the performance loss is too high for other apps you can mount mergerfs twice. Once with `direct_io` enabled and one without it.
+
+#### mmap performance is really bad
+
+There [is a bug](https://lkml.org/lkml/2016/3/16/260) in caching which affects overall performance of mmap through FUSE in Linux 4.x kernels. It is fixed in [4.4.10 and 4.5.4](https://lkml.org/lkml/2016/5/11/59). 
+
+#### Trashing files occasionally fails
+
+This is the same issue as with Samba. `rename` returns `EXDEV` (in our case that will really only happen with path preserving policies like `epmfs`) and the software doesn't handle the situtation well. This is unfortunately a common failure of software which moves files around. The standard indicates that an implementation `MAY` choose to support non-user home directory trashing of files (which is a `MUST`). The implementation `MAY` also support "top directory trashes" which many probably do. 
+
+To create a `$topdir/.Trash` directory as defined in the standard use the [mergerfs-tools](https://github.com/trapexit/mergerfs-tools) tool `mergerfs.mktrash`.
+
+#### Samba: Moving files / directories fails
+
+Workaround: Copy the file/directory and then remove the original rather than move.
+
+This isn't an issue with Samba but some SMB clients. GVFS-fuse v1.20.3 and prior (found in Ubuntu 14.04 among others) failed to handle certain error codes correctly. Particularly **STATUS_NOT_SAME_DEVICE** which comes from the **EXDEV** which is returned by **rename** when the call is crossing mount points. When a program gets an **EXDEV** it needs to explicitly take an alternate action to accomplish it's goal. In the case of **mv** or similar it tries **rename** and on **EXDEV** falls back to a manual copying of data between the two locations and unlinking the source. In these older versions of GVFS-fuse if it received **EXDEV** it would translate that into **EIO**. This would cause **mv** or most any application attempting to move files around on that SMB share to fail with a IO error.
+
+[GVFS-fuse v1.22.0](https://bugzilla.gnome.org/show_bug.cgi?id=734568) and above fixed this issue but a large number of systems use the older release. On Ubuntu the version can be checked by issuing `apt-cache showpkg gvfs-fuse`. Most distros released in 2015 seem to have the updated release and will work fine but older systems may not. Upgrading gvfs-fuse or the distro in general will address the problem.
+
+In Apple's MacOSX 10.9 they replaced Samba (client and server) with their own product. It appears their new client does not handle **EXDEV** either and responds similar to older release of gvfs on Linux.
+
+#### Supplemental user groups
+
+Due to the overhead of [getgroups/setgroups](http://linux.die.net/man/2/setgroups) mergerfs utilizes a cache. This cache is opportunistic and per thread. Each thread will query the supplemental groups for a user when that particular thread needs to change credentials and will keep that data for the lifetime of the thread. This means that if a user is added to a group it may not be picked up without the restart of mergerfs. However, since the high level FUSE API's (at least the standard version) thread pool dynamically grows and shrinks it's possible that over time a thread will be killed and later a new thread with no cache will start and query the new data.
+
+The gid cache uses fixed storage to simplify the design and be compatible with older systems which may not have C++11 compilers. There is enough storage for 256 users' supplemental groups. Each user is allowed upto 32 supplemental groups. Linux >= 2.6.3 allows upto 65535 groups per user but most other *nixs allow far less. NFS allowing only 16. The system does handle overflow gracefully. If the user has more than 32 supplemental groups only the first 32 will be used. If more than 256 users are using the system when an uncached user is found it will evict an existing user's cache at random. So long as there aren't more than 256 active users this should be fine. If either value is too low for your needs you will have to modify `gidcache.hpp` to increase the values. Note that doing so will increase the memory needed by each thread.
+
+#### mergerfs or libfuse crashing
+
+If suddenly the mergerfs mount point disappears and `Transport endpoint is not connected` is returned when attempting to perform actions within the mount directory **and** the version of libfuse (use `mergerfs -v` to find the version) is older than `2.9.4` its likely due to a bug in libfuse. Affected versions of libfuse can be found in Debian Wheezy, Ubuntu Precise and others.
+
+In order to fix this please install newer versions of libfuse. If using a Debian based distro (Debian,Ubuntu,Mint) you can likely just install newer versions of [libfuse](https://packages.debian.org/unstable/libfuse2) and [fuse](https://packages.debian.org/unstable/fuse) from the repo of a newer release.

 # FAQ

-*It's mentioned that there are some security issues with mhddfs. What are they? How does mergerfs address them?*
+#### Why use mergerfs over mhddfs?

-[mhddfs](https://github.com/trapexit/mhddfs) tries to handle being run as **root** by calling [getuid()](https://github.com/trapexit/mhddfs/blob/cae96e6251dd91e2bdc24800b4a18a74044f6672/src/main.c#L319) and if it returns **0** then it will [chown](http://linux.die.net/man/1/chown) the file. Not only is that a race condition but it doesn't handle many other situations. Rather than attempting to simulate POSIX ACL behaviors the proper behavior is to use [seteuid](http://linux.die.net/man/2/seteuid) and [setegid](http://linux.die.net/man/2/setegid), become the user making the original call and perform the action as them. This is how [mergerfs](https://github.com/trapexit/mergerfs) handles things.  
+mhddfs is no longer maintained and has some known stability and security issues (see below).

-If you are familiar with POSIX standards you'll know that this behavior poses a problem. **seteuid** and **setegid** affect the whole process and **libfuse** is multithreaded by default. We'd need to lock access to **seteuid** and **setegid** with a mutex so that the several threads aren't stepping on one another and files end up with weird permissions and ownership. This however wouldn't scale well. With lots of calls the contention on that mutex would be extremely high. Thankfully on Linux and OSX we have a better solution.  
+#### Why use mergerfs over aufs?

-OSX has a [non-portable pthread extension](https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/pthread_setugid_np.2.html) for per-thread user and group impersonation.  
+While aufs can offer better peak performance mergerfs offers more configurability and is generally easier to use. mergerfs however doesn't offer the overlay features which tends to result in whiteout files being left around the underlying filesystems.

-Linux does not support [pthread_setugid_np](https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/pthread_setugid_np.2.html) but user and group IDs are a per-thread attribute though documentation on that fact or how to manipulate them is not well distributed. From the **4.00** release of the Linux man-pages project for [setuid](http://man7.org/linux/man-pages/man2/setuid.2.html)  
+#### Why use mergerfs over LVM/ZFS/BTRFS/RAID0 drive concatenation / striping?

-> At the kernel level, user IDs and group IDs are a per-thread attribute.  However, POSIX requires that all threads in a process share the same credentials.  The NPTL threading implementation handles the POSIX requirements by providing wrapper functions for the various system calls that change process UIDs and GIDs.  These wrapper functions (including the one for setuid()) employ a signal-based technique to ensure that when one thread changes credentials, all of the other threads in the process also change their credentials.  For details, see nptl(7).  
+A single drive failure will lead to full pool failure without additional redundancy. mergerfs performs a similar behavior without the catastrophic failure and lack of recovery. Drives can fail and all other data will continue to be accessable.

-Turns out the setreuid syscalls apply only to the thread. GLIBC hides this away using RT signals to inform all threads to change credentials. Taking after **Samba** mergerfs uses **syscall(SYS_setreuid,...)** to set the callers credentials for that thread only. Jumping back to **root** as necessary should escalated privileges be needed (for instance: to clone paths).  
+#### Can drives be written to directly? Outside of mergerfs while pooled?

-For non-Linux systems mergerfs uses a read-write lock and changes credentials only when necessary. If multiple threads are to be user X then only the first one will need to change the processes credentials. So long as the other threads need to be user X they will take a readlock allow multiple threads to share the credentials. Once a request comes in to run as user Y that thread will attempt a write lock and change to Y's credentials when it can. If the ability to give writers priority is supported then that flag will be used so threads trying to change credentials don't starve. This isn't the best solution but should work reasonably well. As new platforms are supported if they offer per thread credentials those APIs will be adopted.   
+Yes. It will be represented immediately in the pool as the policies would describe.
+
+#### It's mentioned that there are some security issues with mhddfs. What are they? How does mergerfs address them?
+
+[mhddfs](https://github.com/trapexit/mhddfs) tries to handle being run as **root** by calling [getuid()](https://github.com/trapexit/mhddfs/blob/cae96e6251dd91e2bdc24800b4a18a74044f6672/src/main.c#L319) and if it returns **0** then it will [chown](http://linux.die.net/man/1/chown) the file. Not only is that a race condition but it doesn't handle many other situations. Rather than attempting to simulate POSIX ACL behaviors the proper behavior is to use [seteuid](http://linux.die.net/man/2/seteuid) and [setegid](http://linux.die.net/man/2/setegid), become the user making the original call and perform the action as them. This is how [mergerfs](https://github.com/trapexit/mergerfs) handles things.
+
+If you are familiar with POSIX standards you'll know that this behavior poses a problem. **seteuid** and **setegid** affect the whole process and **libfuse** is multithreaded by default. We'd need to lock access to **seteuid** and **setegid** with a mutex so that the several threads aren't stepping on one anofther and files end up with weird permissions and ownership. This however wouldn't scale well. With lots of calls the contention on that mutex would be extremely high. Thankfully on Linux and OSX we have a better solution.
+
+OSX has a [non-portable pthread extension](https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/pthread_setugid_np.2.html) for per-thread user and group impersonation.
+
+Linux does not support [pthread_setugid_np](https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man2/pthread_setugid_np.2.html) but user and group IDs are a per-thread attribute though documentation on that fact or how to manipulate them is not well distributed. From the **4.00** release of the Linux man-pages project for [setuid](http://man7.org/linux/man-pages/man2/setuid.2.html).
+
+> At the kernel level, user IDs and group IDs are a per-thread attribute.  However, POSIX requires that all threads in a process share the same credentials.  The NPTL threading implementation handles the POSIX requirements by providing wrapper functions for the various system calls that change process UIDs and GIDs.  These wrapper functions (including the one for setuid()) employ a signal-based technique to ensure that when one thread changes credentials, all of the other threads in the process also change their credentials.  For details, see nptl(7).
+
+Turns out the setreuid syscalls apply only to the thread. GLIBC hides this away using RT signals to inform all threads to change credentials. Taking after **Samba** mergerfs uses **syscall(SYS_setreuid,...)** to set the callers credentials for that thread only. Jumping back to **root** as necessary should escalated privileges be needed (for instance: to clone paths).
+
+For non-Linux systems mergerfs uses a read-write lock and changes credentials only when necessary. If multiple threads are to be user X then only the first one will need to change the processes credentials. So long as the other threads need to be user X they will take a readlock allow multiple threads to share the credentials. Once a request comes in to run as user Y that thread will attempt a write lock and change to Y's credentials when it can. If the ability to give writers priority is supported then that flag will be used so threads trying to change credentials don't starve. This isn't the best solution but should work reasonably well. As new platforms are supported if they offer per thread credentials those APIs will be adopted.
+
+# SUPPORT
+
+#### Issues with the software
+* github.com: https://github.com/trapexit/mergerfs/issues
+* email: trapexit@spawn.link
+
+#### Support development
+* Gratipay: https://gratipay.com/~trapexit
+* BitCoin: 12CdMhEPQVmjz3SSynkAEuD5q9JmhTDCZA
+
+# LINKS
+
+* http://github.com/trapexit/mergerfs
+* http://github.com/trapexit/mergerfs-tools
+* http://github.com/trapexit/backup-and-recovery-howtos
@@ -4,28 +4,22 @@ Source: http://github.com/trapexit/mergerfs

 Files: *
 Copyright: 2014 Antonio SJ Musumeci <trapexit@spawn.link>
-License: MIT
+License: ISC

 Files: debian/*
 Copyright: 2014 Antonio SJ Musumeci <trapexit@spawn.link>
-License: MIT
+License: ISC

-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-n
+License: ISC
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+n
@@ -1,43 +1,38 @@
 .\"t
-.TH "mergerfs" "1" "2015\-10\-11" "mergerfs user manual" ""
+.TH "mergerfs" "1" "2016\-05\-17" "mergerfs user manual" ""
 .SH NAME
 .PP
-mergerfs \- another FUSE union filesystem
+mergerfs \- another (FUSE based) union filesystem
 .SH SYNOPSIS
 .PP
-mergerfs \-o<options> <srcpoints> <mountpoint>
+mergerfs \-o<options> <srcmounts> <mountpoint>
 .SH DESCRIPTION
 .PP
-\f[B]mergerfs\f[] is similar to \f[B]mhddfs\f[], \f[B]unionfs\f[], and
-\f[B]aufs\f[].
-Like \f[B]mhddfs\f[] in that it too uses \f[B]FUSE\f[].
-Like \f[B]aufs\f[] in that it provides multiple policies for how to
-handle behavior.
-.PP
-Why \f[B]mergerfs\f[] when those exist?
-\f[B]mhddfs\f[] has not been updated in some time nor very flexible.
-There are also security issues when with running as root.
-\f[B]aufs\f[] is more flexible than \f[B]mhddfs\f[] but kernel based and
-difficult to debug when problems arise.
-Neither support file attributes
-(chattr (http://linux.die.net/man/1/chattr)).
+\f[B]mergerfs\f[] is a union filesystem geared towards simplifing
+storage and management of files across numerous commodity storage
+devices.
+It is similar to \f[B]mhddfs\f[], \f[B]unionfs\f[], and \f[B]aufs\f[].
 .SH FEATURES
 .IP \[bu] 2
 Runs in userspace (FUSE)
 .IP \[bu] 2
 Configurable behaviors
 .IP \[bu] 2
-Supports extended attributes (xattrs)
+Support for extended attributes (xattrs)
 .IP \[bu] 2
-Supports file attributes (chattr)
+Support for file attributes (chattr)
 .IP \[bu] 2
-Dynamically configurable (via xattrs)
+Runtime configurable (via xattrs)
 .IP \[bu] 2
 Safe to run as root
 .IP \[bu] 2
 Opportunistic credential caching
 .IP \[bu] 2
 Works with heterogeneous filesystem types
+.IP \[bu] 2
+Handling of writes to full drives
+.IP \[bu] 2
+Handles pool of readonly and read/write drives
 .SH OPTIONS
 .SS options
 .IP \[bu] 2
@@ -49,8 +44,8 @@ These options seem to provide the best performance.
 \f[B]direct_io\f[]: causes FUSE to bypass an addition caching step which
 can increase write speeds at the detriment of read speed.
 .IP \[bu] 2
-\f[B]minfreespace\f[]: the minimum space value used for the
-\f[B]lfs\f[], \f[B]fwfs\f[], and \f[B]epmfs\f[] policies.
+\f[B]minfreespace\f[]: the minimum space value used for creation
+policies.
 Understands \[aq]K\[aq], \[aq]M\[aq], and \[aq]G\[aq] to represent
 kilobyte, megabyte, and gigabyte respectively.
 (default: 4G)
@@ -72,31 +67,43 @@ Example: \f[B]func.getattr=newest\f[]
 \f[B]category.<category>=<policy>\f[]: Sets policy of all FUSE functions
 in the provided category.
 Example: \f[B]category.create=mfs\f[]
+.IP \[bu] 2
+\f[B]fsname\f[]: sets the name of the filesystem as seen in
+\f[B]mount\f[], \f[B]df\f[], etc.
+Defaults to a list of the source paths concatenated together with the
+longest common prefix removed.
 .PP
 \f[B]NOTE:\f[] Options are evaluated in the order listed so if the
 options are \f[B]func.rmdir=rand,category.action=ff\f[] the
 \f[B]action\f[] category setting will override the \f[B]rmdir\f[]
 setting.
-.SS srcpoints
+.SS srcmounts
 .PP
-The source points argument is a colon (\[aq]:\[aq]) delimited list of
-paths.
-To make it simpler to include multiple source points without having to
-modify your fstab (http://linux.die.net/man/5/fstab) we also support
+The srcmounts (source mounts) argument is a colon (\[aq]:\[aq])
+delimited list of paths to be included in the pool.
+It does not matter if the paths are on the same or different drives nor
+does it matter the filesystem.
+Used and available space will not be duplicated for paths on the same
+device and any features which aren\[aq]t supported by the underlying
+filesystem (such as file attributes or extended attributes) will return
+the appropriate errors.
+.PP
+To make it easier to include multiple source mounts mergerfs supports
 globbing (http://linux.die.net/man/7/glob).
 \f[B]The globbing tokens MUST be escaped when using via the shell else
-the shell itself will probably expand it.\f[]
+the shell itself will expand it.\f[]
 .IP
 .nf
 \f[C]
-$\ mergerfs\ /mnt/disk\\*:/mnt/cdrom\ /media/drives
+$\ mergerfs\ \-o\ defaults,allow_other\ /mnt/disk\\*:/mnt/cdrom\ /media/drives
 \f[]
 .fi
 .PP
-The above line will use all points in /mnt prefixed with \f[I]disk\f[]
-and the directory \f[I]cdrom\f[].
+The above line will use all mount points in /mnt prefixed with
+\f[B]disk\f[] and the \f[B]cdrom\f[].
 .PP
-In /etc/fstab it\[aq]d look like the following:
+To have the pool mounted at boot or otherwise accessable from related
+tools use \f[B]/etc/fstab\f[].
 .IP
 .nf
 \f[C]
@@ -105,22 +112,34 @@ In /etc/fstab it\[aq]d look like the following:
 \f[]
 .fi
 .PP
-\f[B]NOTE:\f[] the globbing is done at mount or xattr update time.
+\f[B]NOTE:\f[] the globbing is done at mount or xattr update time (see
+below).
 If a new directory is added matching the glob after the fact it will not
-be included.
-.SH POLICIES
+be automatically included.
 .PP
-Filesystem calls are broken up into 3 categories: \f[B]action\f[],
-\f[B]create\f[], \f[B]search\f[].
-There are also some calls which have no policy attached due to state
-being kept between calls.
-These categories can be assigned a policy which dictates how
+\f[B]NOTE:\f[] for mounting via \f[B]fstab\f[] to work you must have
+\f[B]mount.fuse\f[] installed.
+For Ubuntu/Debian it is included in the \f[B]fuse\f[] package.
+.SH FUNCTIONS / POLICIES / CATEGORIES
+.PP
+The POSIX filesystem API has a number of functions.
+\f[B]creat\f[], \f[B]stat\f[], \f[B]chown\f[], etc.
+In mergerfs these functions are grouped into 3 categories:
+\f[B]action\f[], \f[B]create\f[], and \f[B]search\f[].
+Functions and categories can be assigned a policy which dictates how
 \f[B]mergerfs\f[] behaves.
-Any policy can be assigned to a category though some aren\[aq]t terribly
-practical.
-For instance: \f[B]rand\f[] (Random) may be useful for \f[B]create\f[]
-but could lead to very odd behavior if used for \f[B]search\f[].
-.SS Functional classifications
+Any policy can be assigned to a function or category though some are not
+very practical.
+For instance: \f[B]rand\f[] (random) may be useful for file creation
+(create) but could lead to very odd behavior if used for \f[C]chmod\f[]
+(though only if there were more than one copy of the file).
+.PP
+Policies, when called to create, will ignore drives which are readonly
+or have less than \f[B]minfreespace\f[].
+This allows for read/write and readonly drives to be mixed together and
+keep drives which may remount as readonly on error from further
+affecting the pool.
+.SS Function / Category classifications
 .PP
 .TS
 tab(@);
@@ -155,11 +174,12 @@ statfs, write
 T}
 .TE
 .PP
-\f[B]ioctl\f[] behaves differently if its acting on a directory.
+Due to FUSE limitations \f[B]ioctl\f[] behaves differently if its acting
+on a directory.
 It\[aq]ll use the \f[B]getattr\f[] policy to find and open the directory
 before issuing the \f[B]ioctl\f[].
 In other cases where something may be searched (to confirm a directory
-exists across all source mounts) then \f[B]getattr\f[] will be used.
+exists across all source mounts) \f[B]getattr\f[] will also be used.
 .SS Policy descriptions
 .PP
 .TS
@@ -172,63 +192,96 @@ Description
 T}
 _
 T{
-ff (first found)
+all
 T}@T{
-Given the order of the drives act on the first one found (regardless if
-stat would return EACCES).
+Search category: acts like \f[B]ff\f[].
+Action category: apply to all found.
+Create category: for \f[B]mkdir\f[], \f[B]mknod\f[], and
+\f[B]symlink\f[] it will apply to all found.
+\f[B]create\f[] works like \f[B]ff\f[].
+It will exclude readonly drives and those with free space less than
+\f[B]minfreespace\f[].
 T}
 T{
-ffwp (first found w/ permissions)
+eplfs (existing path, least free space)
 T}@T{
-Given the order of the drives act on the first one found which you have
-access (stat does not error with EACCES).
+If the path exists on multiple drives use the one with the least free
+space.
+For \f[B]create\f[] category it will exclude readonly drives and those
+with free space less than \f[B]minfreespace\f[].
+Falls back to \f[B]lfs\f[].
 T}
 T{
-newest (newest file)
+eplus (existing path, least used space)
 T}@T{
-If multiple files exist return the one with the most recent mtime.
-T}
-T{
-mfs (most free space)
-T}@T{
-Use the drive with the most free space available.
+If the path exists on multiple drives the the one with the least used
+space.
+For \f[B]create\f[] category it will exclude readonly drives and those
+with free space less than \f[B]minfreespace\f[].
+Falls back to \f[B]lus\f[].
 T}
 T{
 epmfs (existing path, most free space)
 T}@T{
 If the path exists on multiple drives use the one with the most free
-space and is greater than \f[B]minfreespace\f[].
-If no drive has at least \f[B]minfreespace\f[] then fallback to
-\f[B]mfs\f[].
+space.
+For \f[B]create\f[] category it will exclude readonly drives and those
+with free space less than \f[B]minfreespace\f[].
+Falls back to \f[B]mfs\f[].
 T}
 T{
-fwfs (first with free space)
+erofs
 T}@T{
-Pick the first drive which has at least \f[B]minfreespace\f[].
+Exclusively return \f[B]\-1\f[] with \f[B]errno\f[] set to
+\f[B]EROFS\f[].
+By setting \f[B]create\f[] functions to this you can in effect turn the
+filesystem readonly.
+T}
+T{
+ff (first found)
+T}@T{
+Given the order of the drives, as defined at mount time or when
+configured via xattr interface, act on the first one found.
+For \f[B]create\f[] category it will exclude readonly drives and those
+with free space less than \f[B]minfreespace\f[] (unless there is no
+other option).
 T}
 T{
 lfs (least free space)
 T}@T{
-Pick the drive with least available space but more than
-\f[B]minfreespace\f[].
+Pick the drive with the least available free space.
+For \f[B]create\f[] category it will exclude readonly drives and those
+with free space less than \f[B]minfreespace\f[].
+Falls back to \f[B]mfs\f[].
+T}
+T{
+lus (least used space)
+T}@T{
+Pick the drive with the least used space.
+For \f[B]create\f[] category it will exclude readonly drives and those
+with free space less than \f[B]minfreespace\f[].
+Falls back to \f[B]mfs\f[].
+T}
+T{
+mfs (most free space)
+T}@T{
+Pick the drive with the most available free space.
+For \f[B]create\f[] category it will exclude readonly drives and those
+with free space less than \f[B]minfreespace\f[].
+Falls back to \f[B]ff\f[].
+T}
+T{
+newest (newest file)
+T}@T{
+Pick the file / directory with the largest mtime.
+For \f[B]create\f[] category it will exclude readonly drives and those
+with free space less than \f[B]minfreespace\f[] (unless there is no
+other option).
 T}
 T{
 rand (random)
 T}@T{
-Pick an existing drive at random.
-T}
-T{
-all
-T}@T{
-Applies action to all found.
-For searches it will behave like first found \f[B]ff\f[].
-T}
-T{
-enosys, einval, enotsup, exdev, erofs
-T}@T{
-Exclusively return \f[C]\-1\f[] with \f[C]errno\f[] set to the
-respective value.
-Useful for debugging other applications\[aq] behavior to errors.
+Calls \f[B]all\f[] and then randomizes.
 T}
 .TE
 .SS Defaults
@@ -258,53 +311,113 @@ T}@T{
 ff
 T}
 .TE
-.SS rename
+.SS rename & link
 .PP
 rename (http://man7.org/linux/man-pages/man2/rename.2.html) is a tricky
 function in a merged system.
-Normally if a rename can\[aq]t be done atomically due to the from and to
-paths existing on different mount points it will return \f[C]\-1\f[]
-with \f[C]errno\ =\ EXDEV\f[].
+Normally if a rename can\[aq]t be done atomically due to the source and
+destination paths existing on different mount points it will return
+\f[B]\-1\f[] with \f[B]errno = EXDEV\f[].
 The atomic rename is most critical for replacing files in place
 atomically (such as securing writing to a temp file and then replacing a
 target).
 The problem is that by merging multiple paths you can have N instances
 of the source and destinations on different drives.
-Meaning that if you just renamed each source locally you could end up
-with the destination files not overwriten / replaced.
-To address this mergerfs works in the following way.
-If the source and destination exist in different directories it will
-immediately return \f[C]EXDEV\f[].
-Generally it\[aq]s not expected for cross directory renames to work so
-it should be fine for most instances (mv,rsync,etc.).
-If they do belong to the same directory it then runs the \f[C]rename\f[]
-policy to get the files to rename.
-It iterates through and renames each file while keeping track of those
-paths which have not been renamed.
-If all the renames succeed it will then \f[C]unlink\f[] or
-\f[C]rmdir\f[] the other paths to clean up any preexisting target files.
-This allows the new file to be found without the file itself ever
-disappearing.
-There may still be some issues with this behavior.
-Particularly on error.
-At the moment however this seems the best policy.
+This can lead to several undesirable situtations with or without errors
+and it\[aq]s not entirely obvious what to do when an error occurs.
+.PP
+Originally mergerfs would return EXDEV whenever a rename was requested
+which was cross directory in any way.
+This made the code simple and was technically complient with POSIX
+requirements.
+However, many applications fail to handle EXDEV at all and treat it as a
+normal error or they only partially support EXDEV (don\[aq]t respond the
+same as \f[C]mv\f[] would).
+Such apps include: gvfsd\-fuse v1.20.3 and prior, Finder / CIFS/SMB
+client in Apple OSX 10.9+, NZBGet, Samba\[aq]s recycling bin feature.
+.IP \[bu] 2
+If using a \f[B]create\f[] policy which tries to preserve directory
+paths (epmfs,eplfs)
+.IP \[bu] 2
+Using the \f[B]rename\f[] policy get the list of files to rename
+.IP \[bu] 2
+For each file attempt rename:
+.RS 2
+.IP \[bu] 2
+If failure with ENOENT run \f[B]create\f[] policy
+.IP \[bu] 2
+If create policy returns the same drive as currently evaluating then
+clone the path
+.IP \[bu] 2
+Re\-attempt rename
+.RE
+.IP \[bu] 2
+If \f[B]any\f[] of the renames succeed the higher level rename is
+considered a success
+.IP \[bu] 2
+If \f[B]no\f[] renames succeed the first error encountered will be
+returned
+.IP \[bu] 2
+On success:
+.RS 2
+.IP \[bu] 2
+Remove the target from all drives with no source file
+.IP \[bu] 2
+Remove the source from all drives which failed to rename
+.RE
+.IP \[bu] 2
+If using a \f[B]create\f[] policy which does \f[B]not\f[] try to
+preserve directory paths
+.IP \[bu] 2
+Using the \f[B]rename\f[] policy get the list of files to rename
+.IP \[bu] 2
+Using the \f[B]getattr\f[] policy get the target path
+.IP \[bu] 2
+For each file attempt rename:
+.RS 2
+.IP \[bu] 2
+If the source drive != target drive:
+.IP \[bu] 2
+Clone target path from target drive to source drive
+.IP \[bu] 2
+Rename
+.RE
+.IP \[bu] 2
+If \f[B]any\f[] of the renames succeed the higher level rename is
+considered a success
+.IP \[bu] 2
+If \f[B]no\f[] renames succeed the first error encountered will be
+returned
+.IP \[bu] 2
+On success:
+.RS 2
+.IP \[bu] 2
+Remove the target from all drives with no source file
+.IP \[bu] 2
+Remove the source from all drives which failed to rename
+.RE
+.PP
+The the removals are subject to normal entitlement checks.
+.PP
+The above behavior will help minimize the likelihood of EXDEV being
+returned but it will still be possible.
+To remove the possibility all together mergerfs would need to perform
+the as \f[B]mv\f[] does when it receives EXDEV normally.
+.PP
+\f[B]link\f[] uses the same basic strategy.
 .SS readdir
 .PP
-readdir (http://linux.die.net/man/3/readdir) is very different from most
-functions in this realm.
-It certainly could have it\[aq]s own set of policies to tweak its
-behavior.
-At this time it provides a simple \f[B]first found\f[] merging of
-directories and file found.
-That is: only the first file or directory found for a directory is
-returned.
-Given how FUSE works though the data representing the returned entry
-comes from \f[B]getattr\f[].
-.PP
-It could be extended to offer the ability to see all files found.
-Perhaps concatenating \f[B]#\f[] and a number to the name.
-But to really be useful you\[aq]d need to be able to access them which
-would complicate file lookup.
+readdir (http://linux.die.net/man/3/readdir) is different from all other
+filesystem functions.
+While it could have it\[aq]s own set of policies to tweak its behavior
+at this time it provides a simple union of files and directories found.
+Remember that any action or information queried about these files and
+directories come from the respective function.
+For instance: an \f[B]ls\f[] is a \f[B]readdir\f[] and for each
+file/directory returned \f[B]getattr\f[] is called.
+Meaning the policy of \f[B]getattr\f[] is responsible for choosing the
+file/directory which is the source of the metadata you see in an
+\f[B]ls\f[].
 .SS statvfs
 .PP
 statvfs (http://linux.die.net/man/2/statvfs) normalizes the source
@@ -312,15 +425,8 @@ drives based on the fragment size and sums the number of adjusted blocks
 and inodes.
 This means you will see the combined space of all sources.
 Total, used, and free.
-The sources however are dedupped based on the drive so multiple points
+The sources however are dedupped based on the drive so multiple sources
 on the same drive will not result in double counting it\[aq]s space.
-.PP
-\f[B]NOTE:\f[] Since we can not (easily) replicate the atomicity of an
-\f[B]mkdir\f[] or \f[B]mknod\f[] without side effects those calls will
-first do a scan to see if the file exists and then attempts a create.
-This means there is a slight race condition.
-Worse case you\[aq]d end up with the directory or file on more than one
-mount.
 .SH BUILDING
 .PP
 \f[B]NOTE:\f[] Prebuilt packages can be found at:
@@ -332,14 +438,14 @@ First get the code from github (http://github.com/trapexit/mergerfs).
 \f[C]
 $\ git\ clone\ https://github.com/trapexit/mergerfs.git
 $\ #\ or
-$\ wget\ https://github.com/trapexit/mergerfs/archive/master.zip
+$\ wget\ https://github.com/trapexit/mergerfs/releases/download/<ver>/mergerfs\-<ver>.tar.gz
 \f[]
 .fi
 .SS Debian / Ubuntu
 .IP
 .nf
 \f[C]
-$\ sudo\ apt\-get\ install\ g++\ pkg\-config\ git\ git\-buildpackage\ pandoc\ debhelper\ libfuse\-dev\ libattr1\-dev
+$\ sudo\ apt\-get\ install\ g++\ pkg\-config\ git\ git\-buildpackage\ pandoc\ debhelper\ libfuse\-dev\ libattr1\-dev\ python
 $\ cd\ mergerfs
 $\ make\ deb
 $\ sudo\ dpkg\ \-i\ ../mergerfs_version_arch.deb
@@ -350,7 +456,7 @@ $\ sudo\ dpkg\ \-i\ ../mergerfs_version_arch.deb
 .nf
 \f[C]
 $\ su\ \-
-#\ dnf\ install\ rpm\-build\ fuse\-devel\ libattr\-devel\ pandoc\ gcc\-c++\ git\ make\ which
+#\ dnf\ install\ rpm\-build\ fuse\-devel\ libattr\-devel\ pandoc\ gcc\-c++\ git\ make\ which\ python
 #\ cd\ mergerfs
 #\ make\ rpm
 #\ rpm\ \-i\ rpmbuild/RPMS/<arch>/mergerfs\-<verion>.<arch>.rpm
@@ -358,7 +464,7 @@ $\ su\ \-
 .fi
 .SS Generically
 .PP
-Have pkg\-config, pandoc, libfuse, libattr1 installed.
+Have git, python, pkg\-config, pandoc, libfuse, libattr1 installed.
 .IP
 .nf
 \f[C]
@@ -383,79 +489,29 @@ The file will not show up in \f[B]readdir\f[] but can be
 \f[B]stat\f[]\[aq]ed and manipulated via
 {list,get,set}xattrs (http://linux.die.net/man/2/listxattr) calls.
 .PP
-Even if xattrs are disabled the
-{list,get,set}xattrs (http://linux.die.net/man/2/listxattr) calls will
-still work.
+Even if xattrs are disabled for mergerfs the
+{list,get,set}xattrs (http://linux.die.net/man/2/listxattr) calls
+against this pseudo file will still work.
+.PP
+Any changes made at runtime are \f[B]not\f[] persisted.
+If you wish for values to persist they must be included as options
+wherever you configure the mounting of mergerfs (fstab).
 .SS Keys
 .PP
 Use \f[C]xattr\ \-l\ /mount/point/.mergerfs\f[] to see all supported
 keys.
-.SS Example
-.IP
-.nf
-\f[C]
-[trapexit:/tmp/mount]\ $\ xattr\ \-l\ .mergerfs
-user.mergerfs.srcmounts:\ /tmp/a:/tmp/b
-user.mergerfs.minfreespace:\ 4294967295
-user.mergerfs.moveonenospc:\ false
-user.mergerfs.policies:\ all,einval,enosys,enotsup,epmfs,erofs,exdev,ff,ffwp,fwfs,lfs,mfs,newest,rand
-user.mergerfs.version:\ x.y.z
-user.mergerfs.category.action:\ all
-user.mergerfs.category.create:\ epmfs
-user.mergerfs.category.search:\ ff
-user.mergerfs.func.access:\ ff
-user.mergerfs.func.chmod:\ all
-user.mergerfs.func.chown:\ all
-user.mergerfs.func.create:\ epmfs
-user.mergerfs.func.getattr:\ ff
-user.mergerfs.func.getxattr:\ ff
-user.mergerfs.func.link:\ all
-user.mergerfs.func.listxattr:\ ff
-user.mergerfs.func.mkdir:\ epmfs
-user.mergerfs.func.mknod:\ epmfs
-user.mergerfs.func.open:\ ff
-user.mergerfs.func.readlink:\ ff
-user.mergerfs.func.removexattr:\ all
-user.mergerfs.func.rename:\ all
-user.mergerfs.func.rmdir:\ all
-user.mergerfs.func.setxattr:\ all
-user.mergerfs.func.symlink:\ epmfs
-user.mergerfs.func.truncate:\ all
-user.mergerfs.func.unlink:\ all
-user.mergerfs.func.utimens:\ all
-
-[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.category.search\ .mergerfs
-ff
-
-[trapexit:/tmp/mount]\ $\ xattr\ \-w\ user.mergerfs.category.search\ ffwp\ .mergerfs
-[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.category.search\ .mergerfs
-ffwp
-
-[trapexit:/tmp/mount]\ $\ xattr\ \-w\ user.mergerfs.srcmounts\ +/tmp/c\ .mergerfs
-[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.srcmounts\ .mergerfs
-/tmp/a:/tmp/b:/tmp/c
-
-[trapexit:/tmp/mount]\ $\ xattr\ \-w\ user.mergerfs.srcmounts\ =/tmp/c\ .mergerfs
-[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.srcmounts\ .mergerfs
-/tmp/c
-
-[trapexit:/tmp/mount]\ $\ xattr\ \-w\ user.mergerfs.srcmounts\ \[aq]+</tmp/a:/tmp/b\[aq]\ .mergerfs
-[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.srcmounts\ .mergerfs
-/tmp/a:/tmp/b:/tmp/c
-\f[]
-.fi
+Some are informational and therefore readonly.
 .SS user.mergerfs.srcmounts
 .PP
-For \f[B]user.mergerfs.srcmounts\f[] there are several instructions
-available for manipulating the list.
-The value provided is just as the value used at mount time.
-A colon (\[aq]:\[aq]) delimited list of full path globs.
+Used to query or modify the list of source mounts.
+When modifying there are several shortcuts to easy manipulation of the
+list.
 .PP
 .TS
 tab(@);
 l l.
 T{
-Instruction
+Value
 T}@T{
 Description
 T}
@@ -493,20 +549,53 @@ T}
 .TE
 .SS minfreespace
 .PP
-Input: interger with an optional suffix.
+Input: interger with an optional multiplier suffix.
 \f[B]K\f[], \f[B]M\f[], or \f[B]G\f[].
+.PP
 Output: value in bytes
 .SS moveonenospc
 .PP
-Input: \f[B]true\f[] and \f[B]false\f[] Ouput: \f[B]true\f[] or
-\f[B]false\f[]
+Input: \f[B]true\f[] and \f[B]false\f[]
+.PP
+Ouput: \f[B]true\f[] or \f[B]false\f[]
 .SS categories / funcs
 .PP
 Input: short policy string as described elsewhere in this document
+.PP
 Output: the policy string except for categories where its funcs have
 multiple types.
-In that case it will be a comma separated list.
-.SS mergerfs file xattrs
+In that case it will be a comma separated list
+.SS Example
+.IP
+.nf
+\f[C]
+[trapexit:/tmp/mount]\ $\ xattr\ \-l\ .mergerfs
+user.mergerfs.srcmounts:\ /tmp/a:/tmp/b
+user.mergerfs.minfreespace:\ 4294967295
+user.mergerfs.moveonenospc:\ false
+\&...
+
+[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.category.search\ .mergerfs
+ff
+
+[trapexit:/tmp/mount]\ $\ xattr\ \-w\ user.mergerfs.category.search\ newest\ .mergerfs
+[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.category.search\ .mergerfs
+newest
+
+[trapexit:/tmp/mount]\ $\ xattr\ \-w\ user.mergerfs.srcmounts\ +/tmp/c\ .mergerfs
+[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.srcmounts\ .mergerfs
+/tmp/a:/tmp/b:/tmp/c
+
+[trapexit:/tmp/mount]\ $\ xattr\ \-w\ user.mergerfs.srcmounts\ =/tmp/c\ .mergerfs
+[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.srcmounts\ .mergerfs
+/tmp/c
+
+[trapexit:/tmp/mount]\ $\ xattr\ \-w\ user.mergerfs.srcmounts\ \[aq]+</tmp/a:/tmp/b\[aq]\ .mergerfs
+[trapexit:/tmp/mount]\ $\ xattr\ \-p\ user.mergerfs.srcmounts\ .mergerfs
+/tmp/a:/tmp/b:/tmp/c
+\f[]
+.fi
+.SS file / directory xattrs
 .PP
 While they won\[aq]t show up when using
 listxattr (http://linux.die.net/man/2/listxattr) \f[B]mergerfs\f[]
@@ -516,13 +605,13 @@ To access the values you will need to issue a
 getxattr (http://linux.die.net/man/2/getxattr) for one of the following:
 .IP \[bu] 2
 \f[B]user.mergerfs.basepath:\f[] the base mount point for the file given
-the current search policy
+the current getattr policy
 .IP \[bu] 2
 \f[B]user.mergerfs.relpath:\f[] the relative path of the file from the
 perspective of the mount point
 .IP \[bu] 2
 \f[B]user.mergerfs.fullpath:\f[] the full path of the original file
-given the search policy
+given the getattr policy
 .IP \[bu] 2
 \f[B]user.mergerfs.allpaths:\f[] a NUL (\[aq]\[aq]) separated list of
 full paths to all files found
@@ -543,25 +632,41 @@ A\ B\ C
 \f[]
 .fi
 .SH TOOLING
+.PP
+Find tooling to help with managing \f[B]mergerfs\f[] at:
+https://github.com/trapexit/mergerfs\-tools
 .IP \[bu] 2
-/usr/sbin/fsck.mergerfs: Provides permissions and ownership auditing and
-the ability to fix them.
+mergerfs.fsck: Provides permissions and ownership auditing and the
+ability to fix them
+.IP \[bu] 2
+mergerfs.dedup: Will help identify and optionally remove duplicate files
+.IP \[bu] 2
+mergerfs.mktrash: Creates FreeDesktop.org Trash specification compatible
+directories on a mergerfs mount
 .SH TIPS / NOTES
 .IP \[bu] 2
+https://github.com/trapexit/backup\-and\-recovery\-howtos : A set of
+guides / howtos on creating a data storage system, backing it up,
+maintaining it, and recovering from failure.
+.IP \[bu] 2
 If you don\[aq]t see some directories / files you expect in a merged
 point be sure the user has permission to all the underlying directories.
 If \f[C]/drive0/a\f[] has is owned by \f[C]root:root\f[] with ACLs set
 to \f[C]0700\f[] and \f[C]/drive1/a\f[] is \f[C]root:root\f[] and
 \f[C]0755\f[] you\[aq]ll see only \f[C]/drive1/a\f[].
-Use \f[C]fsck.mergerfs\f[] to audit the drive for out of sync
+Use \f[C]mergerfs.fsck\f[] to audit the drive for out of sync
 permissions.
 .IP \[bu] 2
+Do \f[I]not\f[] use \f[C]direct_io\f[] if you expect applications (such
+as rtorrent) to mmap (http://linux.die.net/man/2/mmap) files.
+It is not currently supported in FUSE w/ \f[C]direct_io\f[] enabled.
+.IP \[bu] 2
 Since POSIX gives you only error or success on calls its difficult to
 determine the proper behavior when applying the behavior to multiple
 targets.
-Generally if something succeeds when reading it returns the data it can.
-If something fails when making an action we continue on and return the
-last error.
+\f[B]mergerfs\f[] will return an error only if all attempts of an action
+fail.
+Any success will lead to a success returned.
 .IP \[bu] 2
 The recommended options are \f[B]defaults,allow_other\f[].
 The \f[B]allow_other\f[] is to allow users who are not the one which
@@ -574,18 +679,19 @@ In that case simply use the other options manually.
 .IP \[bu] 2
 If write performance is valued more than read it may be useful to enable
 \f[B]direct_io\f[].
+Best to benchmark with and without and choose appropriately.
 .IP \[bu] 2
-Remember that some policies mixed with some functions may result in
-strange behaviors.
+Remember: some policies mixed with some functions may result in strange
+behaviors.
 Not that some of these behaviors and race conditions couldn\[aq]t happen
 outside \f[B]mergerfs\f[] but that they are far more likely to occur on
 account of attempt to merge together multiple sources of data which
 could be out of sync due to the different policies.
 .IP \[bu] 2
-An example: Kodi (http://kodi.tv) and Plex (http://plex.tv) can
-apparently use directory mtime (http://linux.die.net/man/2/stat) to more
-efficiently determine whether or not to scan for new content rather than
-simply performing a full scan.
+An example: Kodi (http://kodi.tv) and Plex (http://plex.tv) can use
+directory mtime (http://linux.die.net/man/2/stat) to more efficiently
+determine whether to scan for new content rather than simply performing
+a full scan.
 If using the current default \f[B]getattr\f[] policy of \f[B]ff\f[] its
 possible \f[B]Kodi\f[] will miss an update on account of it returning
 the first directory found\[aq]s \f[B]stat\f[] info and its a later
@@ -602,12 +708,42 @@ Due to previously mentioned issues its generally best to set
 \f[B]func\f[]\[aq]s.
 This will help limit the confusion of tools such as
 rsync (http://linux.die.net/man/1/rsync).
-.SH Known Issues / Bugs
-.SS Samba
-.IP \[bu] 2
-Moving files or directories between directories on a SMB share fail with
-IO errors.
-.RS 2
+.SH KNOWN ISSUES / BUGS
+.SS rtorrent fails with ENODEV (No such device)
+.PP
+Be sure to turn off \f[C]direct_io\f[].
+rtorrent and some other applications use
+mmap (http://linux.die.net/man/2/mmap) to read and write to files and
+offer no failback to traditional methods.
+FUSE does not currently support mmap while using \f[C]direct_io\f[].
+There will be a performance penalty on writes with \f[C]direct_io\f[]
+off but it\[aq]s the only way to get such applications to work.
+If the performance loss is too high for other apps you can mount
+mergerfs twice.
+Once with \f[C]direct_io\f[] enabled and one without it.
+.SS mmap performance is really bad
+.PP
+There is a bug (https://lkml.org/lkml/2016/3/16/260) in caching which
+affects overall performance of mmap through FUSE in Linux 4.x kernels.
+It is fixed in 4.4.10 and 4.5.4 (https://lkml.org/lkml/2016/5/11/59).
+.SS Trashing files occasionally fails
+.PP
+This is the same issue as with Samba.
+\f[C]rename\f[] returns \f[C]EXDEV\f[] (in our case that will really
+only happen with path preserving policies like \f[C]epmfs\f[]) and the
+software doesn\[aq]t handle the situtation well.
+This is unfortunately a common failure of software which moves files
+around.
+The standard indicates that an implementation \f[C]MAY\f[] choose to
+support non\-user home directory trashing of files (which is a
+\f[C]MUST\f[]).
+The implementation \f[C]MAY\f[] also support "top directory trashes"
+which many probably do.
+.PP
+To create a \f[C]$topdir/.Trash\f[] directory as defined in the standard
+use the mergerfs\-tools (https://github.com/trapexit/mergerfs-tools)
+tool \f[C]mergerfs.mktrash\f[].
+.SS Samba: Moving files / directories fails
 .PP
 Workaround: Copy the file/directory and then remove the original rather
 than move.
@@ -617,7 +753,7 @@ GVFS\-fuse v1.20.3 and prior (found in Ubuntu 14.04 among others) failed
 to handle certain error codes correctly.
 Particularly \f[B]STATUS_NOT_SAME_DEVICE\f[] which comes from the
 \f[B]EXDEV\f[] which is returned by \f[B]rename\f[] when the call is
-crossing mountpoints.
+crossing mount points.
 When a program gets an \f[B]EXDEV\f[] it needs to explicitly take an
 alternate action to accomplish it\[aq]s goal.
 In the case of \f[B]mv\f[] or similar it tries \f[B]rename\f[] and on
@@ -641,27 +777,24 @@ In Apple\[aq]s MacOSX 10.9 they replaced Samba (client and server) with
 their own product.
 It appears their new client does not handle \f[B]EXDEV\f[] either and
 responds similar to older release of gvfs on Linux.
-.RE
-.SS Supplemental groups
-.IP \[bu] 2
+.SS Supplemental user groups
+.PP
 Due to the overhead of
 getgroups/setgroups (http://linux.die.net/man/2/setgroups) mergerfs
 utilizes a cache.
 This cache is opportunistic and per thread.
 Each thread will query the supplemental groups for a user when that
 particular thread needs to change credentials and will keep that data
-for the lifetime of the mount or thread.
+for the lifetime of the thread.
 This means that if a user is added to a group it may not be picked up
 without the restart of mergerfs.
 However, since the high level FUSE API\[aq]s (at least the standard
 version) thread pool dynamically grows and shrinks it\[aq]s possible
 that over time a thread will be killed and later a new thread with no
 cache will start and query the new data.
-.RS 2
 .PP
 The gid cache uses fixed storage to simplify the design and be
-compatible with older systems which may not have C++11 compilers (as the
-original design required).
+compatible with older systems which may not have C++11 compilers.
 There is enough storage for 256 users\[aq] supplemental groups.
 Each user is allowed upto 32 supplemental groups.
 Linux >= 2.6.3 allows upto 65535 groups per user but most other *nixs
@@ -677,11 +810,48 @@ fine.
 If either value is too low for your needs you will have to modify
 \f[C]gidcache.hpp\f[] to increase the values.
 Note that doing so will increase the memory needed by each thread.
-.RE
-.SH FAQ
+.SS mergerfs or libfuse crashing
 .PP
-\f[I]It\[aq]s mentioned that there are some security issues with mhddfs.
-What are they? How does mergerfs address them?\f[]
+If suddenly the mergerfs mount point disappears and
+\f[C]Transport\ endpoint\ is\ not\ connected\f[] is returned when
+attempting to perform actions within the mount directory \f[B]and\f[]
+the version of libfuse (use \f[C]mergerfs\ \-v\f[] to find the version)
+is older than \f[C]2.9.4\f[] its likely due to a bug in libfuse.
+Affected versions of libfuse can be found in Debian Wheezy, Ubuntu
+Precise and others.
+.PP
+In order to fix this please install newer versions of libfuse.
+If using a Debian based distro (Debian,Ubuntu,Mint) you can likely just
+install newer versions of
+libfuse (https://packages.debian.org/unstable/libfuse2) and
+fuse (https://packages.debian.org/unstable/fuse) from the repo of a
+newer release.
+.SH FAQ
+.SS Why use mergerfs over mhddfs?
+.PP
+mhddfs is no longer maintained and has some known stability and security
+issues (see below).
+.SS Why use mergerfs over aufs?
+.PP
+While aufs can offer better peak performance mergerfs offers more
+configurability and is generally easier to use.
+mergerfs however doesn\[aq]t offer the overlay features which tends to
+result in whiteout files being left around the underlying filesystems.
+.SS Why use mergerfs over LVM/ZFS/BTRFS/RAID0 drive concatenation /
+striping?
+.PP
+A single drive failure will lead to full pool failure without additional
+redundancy.
+mergerfs performs a similar behavior without the catastrophic failure
+and lack of recovery.
+Drives can fail and all other data will continue to be accessable.
+.SS Can drives be written to directly? Outside of mergerfs while pooled?
+.PP
+Yes.
+It will be represented immediately in the pool as the policies would
+describe.
+.SS It\[aq]s mentioned that there are some security issues with mhddfs.
+What are they? How does mergerfs address them?
 .PP
 mhddfs (https://github.com/trapexit/mhddfs) tries to handle being run as
 \f[B]root\f[] by calling
@@ -703,7 +873,7 @@ behavior poses a problem.
 \f[B]libfuse\f[] is multithreaded by default.
 We\[aq]d need to lock access to \f[B]seteuid\f[] and \f[B]setegid\f[]
 with a mutex so that the several threads aren\[aq]t stepping on one
-another and files end up with weird permissions and ownership.
+anofther and files end up with weird permissions and ownership.
 This however wouldn\[aq]t scale well.
 With lots of calls the contention on that mutex would be extremely high.
 Thankfully on Linux and OSX we have a better solution.
@@ -717,7 +887,7 @@ pthread_setugid_np (https://developer.apple.com/library/mac/documentation/Darwin
 but user and group IDs are a per\-thread attribute though documentation
 on that fact or how to manipulate them is not well distributed.
 From the \f[B]4.00\f[] release of the Linux man\-pages project for
-setuid (http://man7.org/linux/man-pages/man2/setuid.2.html)
+setuid (http://man7.org/linux/man-pages/man2/setuid.2.html).
 .RS
 .PP
 At the kernel level, user IDs and group IDs are a per\-thread attribute.
@@ -755,5 +925,23 @@ be used so threads trying to change credentials don\[aq]t starve.
 This isn\[aq]t the best solution but should work reasonably well.
 As new platforms are supported if they offer per thread credentials
 those APIs will be adopted.
+.SH SUPPORT
+.SS Issues with the software
+.IP \[bu] 2
+github.com: https://github.com/trapexit/mergerfs/issues
+.IP \[bu] 2
+email: trapexit\@spawn.link
+.SS Support development
+.IP \[bu] 2
+Gratipay: https://gratipay.com/~trapexit
+.IP \[bu] 2
+BitCoin: 12CdMhEPQVmjz3SSynkAEuD5q9JmhTDCZA
+.SH LINKS
+.IP \[bu] 2
+http://github.com/trapexit/mergerfs
+.IP \[bu] 2
+http://github.com/trapexit/mergerfs\-tools
+.IP \[bu] 2
+http://github.com/trapexit/backup\-and\-recovery\-howtos
 .SH AUTHORS
 Antonio SJ Musumeci <trapexit@spawn.link>.
@@ -4,7 +4,7 @@ Release:	1%{?dist}
 Summary:	A FUSE union filesystem

 Group:		Applications/System
-License:	MIT
+License:	ISC
 URL:		https://github.com/trapexit/mergerfs

 Source:		mergerfs-%{version}.tar.gz
@@ -33,10 +33,12 @@ make install PREFIX=%{_prefix} DESTDIR=%{buildroot}

 %files
 %{_bindir}/*
-%{_sbindir}/*
 %doc %{_mandir}/*

 %changelog
+* Mon Jan 25 2016 Antonio SJ Musumeci <trapexit@spawn.link>
+- Remove sbin files
+
 * Sat Sep 05 2015 Antonio SJ Musumeci <trapexit@spawn.link>
 - Include PREFIX to install

@@ -1,33 +1,19 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <fuse.h>
-
 #include <string>
 #include <vector>

@@ -49,19 +35,20 @@ int
 _access(Policy::Func::Search  searchFunc,
        const vector<string> &srcmounts,
        const size_t          minfreespace,
-        const string         &fusepath,
+        const char           *fusepath,
        const int             mask)
 {
  int rv;
-  vector<string> path;
+  string fullpath;
+  vector<const string*> basepaths;

-  rv = searchFunc(srcmounts,fusepath,minfreespace,path);
+  rv = searchFunc(srcmounts,fusepath,minfreespace,basepaths);
  if(rv == -1)
    return -errno;

-  fs::path::append(path[0],fusepath);
+  fs::path::make(basepaths[0],fusepath,fullpath);

-  rv = ::eaccess(path[0].c_str(),mask);
+  rv = ::eaccess(fullpath.c_str(),mask);

  return ((rv == -1) ? -errno : 0);
 }
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #define STATIC_ASSERT(cond) assert::StaticAssert< (cond) >()
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <algorithm>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <algorithm>
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <string>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __CATEGORY_HPP__
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -30,6 +22,7 @@

 #include "config.hpp"
 #include "fs_path.hpp"
+#include "rv.hpp"
 #include "rwlock.hpp"
 #include "ugid.hpp"

@@ -39,33 +32,56 @@ using mergerfs::Policy;

 static
 int
-_chmod(Policy::Func::Action  actionFunc,
-       const vector<string> &srcmounts,
-       const size_t          minfreespace,
-       const string         &fusepath,
-       const mode_t          mode)
+_chmod_loop_core(const string *basepath,
+                 const char   *fusepath,
+                 const mode_t  mode,
+                 const int     error)
 {
  int rv;
+  string fullpath;
+
+  fs::path::make(basepath,fusepath,fullpath);
+
+  rv = ::chmod(fullpath.c_str(),mode);
+
+  return calc_error(rv,error,errno);
+}
+
+static
+int
+_chmod_loop(const vector<const string*> &basepaths,
+            const char                  *fusepath,
+            const mode_t                 mode)
+{
  int error;
-  vector<string> paths;

-  rv = actionFunc(srcmounts,fusepath,minfreespace,paths);
-  if(rv == -1)
-    return -errno;
-
-  error = 0;
-  for(size_t i = 0, ei = paths.size(); i != ei; i++)
+  error = -1;
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
    {
-      fs::path::append(paths[i],fusepath);
-
-      rv = ::chmod(paths[i].c_str(),mode);
-      if(rv == -1)
-        error = errno;
+      error = _chmod_loop_core(basepaths[i],fusepath,mode,error);
    }

  return -error;
 }

+static
+int
+_chmod(Policy::Func::Action  actionFunc,
+       const vector<string> &srcmounts,
+       const size_t          minfreespace,
+       const char           *fusepath,
+       const mode_t          mode)
+{
+  int rv;
+  vector<const string*> basepaths;
+
+  rv = actionFunc(srcmounts,fusepath,minfreespace,basepaths);
+  if(rv == -1)
+    return -errno;
+
+  return _chmod_loop(basepaths,fusepath,mode);
+}
+
 namespace mergerfs
 {
  namespace fuse
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -31,6 +23,7 @@

 #include "config.hpp"
 #include "fs_path.hpp"
+#include "rv.hpp"
 #include "rwlock.hpp"
 #include "ugid.hpp"

@@ -39,34 +32,59 @@ using std::vector;
 using mergerfs::Policy;
 using mergerfs::Config;

+static
+int
+_chown_loop_core(const string *basepath,
+                 const char   *fusepath,
+                 const uid_t   uid,
+                 const gid_t   gid,
+                 const int     error)
+{
+  int rv;
+  string fullpath;
+
+  fs::path::make(basepath,fusepath,fullpath);
+
+  rv = ::lchown(fullpath.c_str(),uid,gid);
+
+  return calc_error(rv,error,errno);
+}
+
+static
+int
+_chown_loop(const vector<const string*> &basepaths,
+            const char                  *fusepath,
+            const uid_t                  uid,
+            const gid_t                  gid)
+{
+  int error;
+
+  error = -1;
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
+    {
+      error = _chown_loop_core(basepaths[i],fusepath,uid,gid,error);
+    }
+
+  return -error;
+}
+
 static
 int
 _chown(Policy::Func::Action  actionFunc,
       const vector<string> &srcmounts,
       const size_t          minfreespace,
-       const string         &fusepath,
+       const char           *fusepath,
       const uid_t           uid,
       const gid_t           gid)
 {
  int rv;
-  int error;
-  vector<string> paths;
+  vector<const string*> basepaths;

-  rv = actionFunc(srcmounts,fusepath,minfreespace,paths);
+  rv = actionFunc(srcmounts,fusepath,minfreespace,basepaths);
  if(rv == -1)
    return -errno;

-  error = 0;
-  for(size_t i = 0, ei = paths.size(); i != ei; i++)
-    {
-      fs::path::append(paths[i],fusepath);
-
-      rv = ::lchown(paths[i].c_str(),uid,gid);
-      if(rv == -1)
-        error = errno;
-    }
-
-  return -error;
+  return _chown_loop(basepaths,fusepath,uid,gid);
 }

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,26 +1,18 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
- */
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/

 #include <errno.h>
 #include <unistd.h>
@@ -51,7 +43,7 @@ namespace clonetool
       char * const argv[])
  {
    int rv = 0;
-    
+
    if(argc == 4 && !strcmp(argv[1],"file"))
      rv = fs::clonefile(argv[2],argv[3]);
    else if(argc == 5 && !strcmp(argv[1],"path"))
@@ -1,26 +1,18 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
- */
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/

 namespace clonetool
 {
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <string>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __CONFIG_HPP__
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -46,39 +38,26 @@ using namespace mergerfs;

 static
 int
-_create(Policy::Func::Search  searchFunc,
-        Policy::Func::Create  createFunc,
-        const vector<string> &srcmounts,
-        const size_t          minfreespace,
-        const string         &fusepath,
-        const mode_t          mode,
-        const int             flags,
-        uint64_t             &fh)
+_create_core(const string &existingpath,
+             const string &createpath,
+             const char   *fusepath,
+             const char   *fusedirpath,
+             const mode_t  mode,
+             const int     flags,
+             uint64_t     &fh)
 {
  int fd;
-  int rv;
-  string dirname;
-  vector<string> createpath;
-  vector<string> existingpath;
+  string fullpath;

-  dirname = fs::path::dirname(fusepath);
-  rv = searchFunc(srcmounts,dirname,minfreespace,existingpath);
-  if(rv == -1)
-    return -errno;
-
-  rv = createFunc(srcmounts,dirname,minfreespace,createpath);
-  if(rv == -1)
-    return -errno;
-
-  if(createpath[0] != existingpath[0])
+  if(createpath != existingpath)
    {
      const ugid::SetRootGuard ugidGuard;
-      fs::clonepath(existingpath[0],createpath[0],dirname);
+      fs::clonepath(existingpath,createpath,fusedirpath);
    }

-  fs::path::append(createpath[0],fusepath);
+  fs::path::make(&createpath,fusepath,fullpath);

-  fd = ::open(createpath[0].c_str(),flags,mode);
+  fd = ::open(fullpath.c_str(),flags,mode);
  if(fd == -1)
    return -errno;

@@ -87,6 +66,41 @@ _create(Policy::Func::Search  searchFunc,
  return 0;
 }

+static
+int
+_create(Policy::Func::Search  searchFunc,
+        Policy::Func::Create  createFunc,
+        const vector<string> &srcmounts,
+        const size_t          minfreespace,
+        const char           *fusepath,
+        const mode_t          mode,
+        const int             flags,
+        uint64_t             &fh)
+{
+  int rv;
+  string fullpath;
+  string fusedirpath;
+  const char *fusedirpathcstr;
+  vector<const string*> createpaths;
+  vector<const string*> existingpaths;
+
+  fusedirpath = fusepath;
+  fs::path::dirname(fusedirpath);
+  fusedirpathcstr = fusedirpath.c_str();
+
+  rv = searchFunc(srcmounts,fusedirpathcstr,minfreespace,existingpaths);
+  if(rv == -1)
+    return -errno;
+
+  rv = createFunc(srcmounts,fusedirpathcstr,minfreespace,createpaths);
+  if(rv == -1)
+    return -errno;
+
+  return _create_core(*existingpaths[0],*createpaths[0],
+                      fusepath,fusedirpathcstr,
+                      mode,flags,fh);
+}
+
 namespace mergerfs
 {
  namespace fuse
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <sys/types.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,38 +1,26 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #if FALLOCATE

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #include <fuse.h>

 #include <errno.h>
-#include <fcntl.h>

+#include "fs_fallocate.hpp"
 #include "fileinfo.hpp"

 static
@@ -44,22 +32,7 @@ _fallocate(const int   fd,
 {
  int rv;

-#ifdef _GNU_SOURCE
-  rv = ::fallocate(fd,mode,offset,len);
-#elif defined _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
-  if(mode)
-    {
-      rv = -1;
-      errno = EOPNOTSUPP;
-    }
-  else
-    {
-      rv = ::posix_fallocate(fd,offset,len);
-    }
-#else
-  rv = -1;
-  errno = EOPNOTSUPP;
-#endif
+  rv = fs::fallocate(fd,mode,offset,len);

  return ((rv == -1) ? -errno : 0);
 }
@@ -77,6 +50,7 @@ namespace mergerfs
    {
      FileInfo *fi = reinterpret_cast<FileInfo*>(ffi->fh);

+
      return _fallocate(fi->fd,
                        mode,
                        offset,
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <sys/types.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __FILEINFO_HPP__
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -35,11 +27,11 @@ _flush(const int fd)
 {
  int rv;

-  rv = dup(fd);
+  rv = ::dup(fd);
  if(rv == -1)
    errno = EIO;
  else
-    rv = close(rv);
+    rv = ::close(rv);

  return ((rv == -1) ? -errno : 0);
 }
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <string>
@@ -39,61 +31,152 @@
 #include "fs_attr.hpp"
 #include "fs_path.hpp"
 #include "fs_xattr.hpp"
+#include "statvfs_util.hpp"
 #include "str.hpp"
+#include "success_fail.hpp"

 using std::string;
 using std::vector;

 namespace fs
 {
+  bool
+  exists(const string &path,
+         struct stat  &st)
+  {
+    int rv;
+
+    rv = ::lstat(path.c_str(),&st);
+
+    return LSTAT_SUCCEEDED(rv);
+  }
+
+  bool
+  exists(const string &path)
+  {
+    struct stat st;
+
+    return exists(path,st);
+  }
+
+  bool
+  statvfs(const string   &path,
+          struct statvfs &st)
+  {
+    int rv;
+
+    rv = ::statvfs(path.c_str(),&st);
+
+    return STATVFS_SUCCEEDED(rv);
+  }
+
+  bool
+  info(const string &path,
+       bool         &readonly,
+       size_t       &spaceavail,
+       size_t       &spaceused)
+  {
+    bool rv;
+    struct statvfs st;
+
+    rv = fs::statvfs(path,st);
+    if(rv)
+      {
+        readonly   = StatVFS::readonly(st);
+        spaceavail = StatVFS::spaceavail(st);
+        spaceused  = StatVFS::spaceused(st);
+      }
+
+    return rv;
+  }
+
+  bool
+  readonly(const string &path)
+  {
+    bool rv;
+    struct statvfs st;
+
+    rv = fs::statvfs(path,st);
+
+    return (rv && StatVFS::readonly(st));
+  }
+
+  bool
+  spaceavail(const string &path,
+             size_t       &spaceavail)
+  {
+    bool rv;
+    struct statvfs st;
+
+    rv = fs::statvfs(path,st);
+    if(rv)
+      spaceavail = StatVFS::spaceavail(st);
+
+    return rv;
+  }
+
+  bool
+  spaceused(const string &path,
+            size_t       &spaceused)
+  {
+    bool rv;
+    struct statvfs st;
+
+    rv = fs::statvfs(path,st);
+    if(rv)
+      spaceused = StatVFS::spaceused(st);
+
+    return rv;
+  }
+
  void
  findallfiles(const vector<string> &srcmounts,
-               const string         &fusepath,
+               const char           *fusepath,
               vector<string>       &paths)
  {
+    string fullpath;
+
    for(size_t i = 0, ei = srcmounts.size(); i != ei; i++)
      {
-        int rv;
-        string fullpath;
-        struct stat st;
+        fs::path::make(&srcmounts[i],fusepath,fullpath);

-        fs::path::make(srcmounts[i],fusepath,fullpath);
+        if(!fs::exists(fullpath))
+          continue;

-        rv = ::lstat(fullpath.c_str(),&st);
-        if(rv == 0)
-          paths.push_back(fullpath);
+        paths.push_back(fullpath);
      }
  }

  int
  findonfs(const vector<string> &srcmounts,
-           const string         &fusepath,
+           const char           *fusepath,
           const int             fd,
           string               &basepath)
  {
    int rv;
-    string tmppath;
-    unsigned long fsid;
-    struct statvfs buf;
+    dev_t dev;
+    string fullpath;
+    struct stat st;

-    rv = ::fstatvfs(fd,&buf);
-    if(rv == -1)
+    rv = ::fstat(fd,&st);
+    if(FSTAT_FAILED(rv))
      return -1;

-    fsid = buf.f_fsid;
+    dev = st.st_dev;
    for(int i = 0, ei = srcmounts.size(); i != ei; i++)
      {
-        fs::path::make(srcmounts[i],fusepath,tmppath);
+        fs::path::make(&srcmounts[i],fusepath,fullpath);

-        rv = ::statvfs(tmppath.c_str(),&buf);
-        if(rv == -1)
+        rv = ::lstat(fullpath.c_str(),&st);
+        if(FSTAT_FAILED(rv))
          continue;

-        if(buf.f_fsid == fsid)
-          {
-            basepath = srcmounts[i];
-            return 0;
-          }
+        if(st.st_dev != dev)
+          continue;
+
+        basepath = srcmounts[i];
+
+        return 0;
      }

    return (errno=ENOENT,-1);
@@ -104,14 +187,19 @@ namespace fs
       vector<string>       &strs)
  {
    int flags;
-    glob_t gbuf;
+    size_t veclen;
+    glob_t gbuf = {0};
+
+    veclen = patterns.size();
+    if(veclen == 0)
+      return;

    flags = 0;
-    for(size_t i = 0; i < patterns.size(); i++)
-      {
-        glob(patterns[i].c_str(),flags,NULL,&gbuf);
-        flags = GLOB_APPEND;
-      }
+    glob(patterns[0].c_str(),flags,NULL,&gbuf);
+
+    flags = GLOB_APPEND;
+    for(size_t i = 1; i < veclen; i++)
+      glob(patterns[i].c_str(),flags,NULL,&gbuf);

    for(size_t i = 0; i < gbuf.gl_pathc; ++i)
      strs.push_back(gbuf.gl_pathv[i]);
@@ -147,34 +235,31 @@ namespace fs
      string               &path)
  {
    fsblkcnt_t mfs;
-    ssize_t    mfsidx;
+    const string *mfsbasepath;

-    mfs    = 0;
-    mfsidx = -1;
+    mfs = 0;
+    mfsbasepath = NULL;
    for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
      {
-        int rv;
-        struct statvfs fsstats;
+        size_t spaceavail;
        const string &basepath = basepaths[i];

-        rv = ::statvfs(basepath.c_str(),&fsstats);
-        if(rv == 0)
-          {
-            fsblkcnt_t spaceavail;
+        if(!fs::spaceavail(basepath,spaceavail))
+          continue;

-            spaceavail = (fsstats.f_frsize * fsstats.f_bavail);
-            if((spaceavail > mfs) && (spaceavail >= minfreespace))
-              {
-                mfs    = spaceavail;
-                mfsidx = i;
-              }
-          }
+        if(spaceavail < minfreespace)
+          continue;
+        if(spaceavail <= mfs)
+          continue;
+
+        mfs         = spaceavail;
+        mfsbasepath = &basepaths[i];
      }

-    if(mfsidx == -1)
+    if(mfsbasepath == NULL)
      return (errno=ENOENT,-1);

-    path = basepaths[mfsidx];
+    path = *mfsbasepath;

    return 0;
  }
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __FS_HPP__
@@ -34,12 +26,32 @@ namespace fs
  using std::string;
  using std::vector;

+  bool exists(const string &path,
+              struct stat  &st);
+  bool exists(const string &path);
+
+  bool statvfs(const string   &path,
+               struct statvfs &st);
+
+  bool info(const string &path,
+            bool         &readonly,
+            size_t       &spaceavail,
+            size_t       &spaceused);
+
+  bool readonly(const string &path);
+
+  bool spaceavail(const string &path,
+                  size_t       &spaceavail);
+
+  bool spaceused(const string &path,
+                 size_t       &spaceavail);
+
  void findallfiles(const vector<string> &srcmounts,
-                    const string         &fusepath,
+                    const char           *fusepath,
                    vector<string>       &paths);

  int findonfs(const vector<string> &srcmounts,
-               const string         &fusepath,
+               const char           *fusepath,
               const int             fd,
               string               &basepath);

@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2015 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <errno.h>
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __FS_ATTR_HPP__
@@ -1,41 +1,32 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2015 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <errno.h>
-#ifdef __linux__
-#include <sys/sendfile.h>
-#endif
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>

 #include <string>
 #include <vector>

 #include "fs_attr.hpp"
+#include "fs_fallocate.hpp"
+#include "fs_sendfile.hpp"
 #include "fs_xattr.hpp"

 using std::string;
@@ -43,20 +34,6 @@ using std::vector;

 namespace fs
 {
-  static
-  ssize_t
-  sendfile(const int    fdin,
-           const int    fdout,
-           const size_t count)
-  {
-#if defined __linux__
-    off_t offset = 0;
-    return ::sendfile(fdout,fdin,&offset,count);
-#else
-    return (errno=EINVAL,-1);
-#endif
-  }
-
  int
  writen(const int     fd,
         const char   *buf,
@@ -77,7 +54,7 @@ namespace fs
          }

        nleft -= nwritten;
-        buf += nwritten;
+        buf   += nwritten;
      }

    return count;
@@ -99,6 +76,8 @@ namespace fs
    bufsize = (blocksize * 16);
    buf.resize(bufsize);

+    ::lseek(fdin,0,SEEK_SET);
+
    totalwritten = 0;
    while(totalwritten < count)
      {
@@ -107,8 +86,7 @@ namespace fs
          {
            if(errno == EINTR)
              continue;
-            else
-              return -1;
+            return -1;
          }

        nw = writen(fdout,&buf[0],nr);
@@ -133,7 +111,7 @@ namespace fs
    ::posix_fadvise(fdin,0,count,POSIX_FADV_WILLNEED);
    ::posix_fadvise(fdin,0,count,POSIX_FADV_SEQUENTIAL);

-    ::posix_fallocate(fdout,0,count);
+    fs::fallocate(fdout,0,0,count);

    rv = fs::sendfile(fdin,fdout,count);
    if((rv == -1) && ((errno == EINVAL) || (errno == ENOSYS)))
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <string>
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2015 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <sys/types.h>
@@ -57,7 +49,7 @@ namespace fs
  int
  clonepath(const string &fromsrc,
            const string &tosrc,
-            const string &relative)
+            const char   *relative)
  {
    int         rv;
    struct stat st;
@@ -65,22 +57,23 @@ namespace fs
    string      frompath;
    string      dirname;

-    dirname = fs::path::dirname(relative);
+    dirname = relative;
+    fs::path::dirname(dirname);
    if(!dirname.empty())
      {
-        rv = clonepath(fromsrc,tosrc,dirname);
+        rv = clonepath(fromsrc,tosrc,dirname.c_str());
        if(rv == -1)
          return -1;
      }

-    fs::path::make(fromsrc,relative,frompath);
+    fs::path::make(&fromsrc,relative,frompath);
    rv = ::stat(frompath.c_str(),&st);
    if(rv == -1)
      return -1;
    else if(!S_ISDIR(st.st_mode))
      return (errno = ENOTDIR,-1);

-    fs::path::make(tosrc,relative,topath);
+    fs::path::make(&tosrc,relative,topath);
    rv = ::mkdir(topath.c_str(),st.st_mode);
    if(rv == -1)
      {
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <string>
@@ -28,5 +20,5 @@ namespace fs
 {
  int clonepath(const std::string &from,
                const std::string &to,
-                const std::string &relative);
+                const char        *relative);
 }
@@ -0,0 +1,44 @@
+/*
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include <errno.h>
+#include <fcntl.h>
+
+#include "fs_fallocate.hpp"
+
+namespace fs
+{
+  int
+  fallocate(const int   fd,
+            const int   mode,
+            const off_t offset,
+            const off_t len)
+  {
+    int rv;
+
+#ifdef __linux__
+    rv = ::fallocate(fd,mode,offset,len);
+#elif _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
+    rv = (mode ?
+          (errno=EOPNOTSUPP,-1) :
+          (::posix_fallocate(fd,offset,len)));
+#else
+    rv = (errno=EOPNOTSUPP,-1);
+#endif
+
+    return rv;
+  }
+}
@@ -0,0 +1,29 @@
+/*
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#ifndef __FS_FALLOCATE_HPP__
+#define __FS_FALLOCATE_HPP__
+
+namespace fs
+{
+  int
+  fallocate(const int   fd,
+            const int   mode,
+            const off_t offset,
+            const off_t len);
+}
+
+#endif // __FS_FALLOCATE_HPP__
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <sys/types.h>
@@ -74,8 +66,9 @@ namespace fs
    if(rv == -1)
      return -1;

-    fusedir = fs::path::dirname(fusepath);
-    rv = fs::clonepath(fdin_path,fdout_path,fusedir);
+    fusedir = fusepath;
+    fs::path::dirname(fusedir);
+    rv = fs::clonepath(fdin_path,fdout_path,fusedir.c_str());
    if(rv == -1)
      return -1;

@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __FS_MOVEFILE_HPP__
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2015 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <dirent.h>
@@ -37,15 +29,14 @@ namespace fs
 {
  namespace path
  {
-    string
-    dirname(const string &path)
+    void
+    dirname(string &path)
    {
-      string parent = path;
      string::reverse_iterator i;
      string::reverse_iterator bi;

-      bi = parent.rend();
-      i  = parent.rbegin();
+      bi = path.rend();
+      i  = path.rbegin();
      while(*i == '/' && i != bi)
        i++;

@@ -55,9 +46,7 @@ namespace fs
      while(*i == '/' && i != bi)
        i++;

-      parent.erase(i.base(),parent.end());
-
-      return parent;
+      path.erase(i.base(),path.end());
    }

    string
@@ -65,54 +54,5 @@ namespace fs
    {
      return path.substr(path.find_last_of('/')+1);
    }
-
-    bool
-    is_empty(const string &path)
-    {
-      DIR           *dir;
-      struct dirent *de;
-
-      dir = ::opendir(path.c_str());
-      if(!dir)
-        return false;
-
-      while((de = ::readdir(dir)))
-        {
-          const char *d_name = de->d_name;
-
-          if(d_name[0] == '.'     &&
-             ((d_name[1] == '\0') ||
-              (d_name[1] == '.' && d_name[2] == '\0')))
-            continue;
-
-          ::closedir(dir);
-
-          return false;
-        }
-
-      ::closedir(dir);
-
-      return true;
-    }
-
-    bool
-    exists(const vector<string> &paths,
-           const string         &fusepath)
-    {
-      for(size_t i = 0, ei = paths.size(); i != ei; i++)
-        {
-          int rv;
-          string path;
-          struct stat st;
-
-          fs::path::make(paths[i],fusepath,path);
-
-          rv  = ::lstat(path.c_str(),&st);
-          if(rv == 0)
-            return true;
-        }
-
-      return false;
-    }
  }
 }
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __FS_PATH_HPP__
@@ -33,43 +25,28 @@ namespace fs
  namespace path
  {
    using std::string;
-    using std::vector;

-    string dirname(const string &path);
+    void dirname(string &path);
+
    string basename(const string &path);

-    bool is_empty(const string &path);
-
-    bool exists(vector<string>::const_iterator  begin,
-                vector<string>::const_iterator  end,
-                const string                   &fusepath);
-    bool exists(const vector<string>           &srcmounts,
-                const string                   &fusepath);
-
-    inline
-    string
-    make(const string &base,
-         const string &suffix)
-    {
-      return base + suffix;
-    }
-
    inline
    void
-    make(const string &base,
-         const string &suffix,
-         string       &output)
-    {
-      output = base + suffix;
-    }
-
-    inline
-    void
-    append(string       &base,
-           const string &suffix)
+    append(string     &base,
+           const char *suffix)
    {
      base += suffix;
    }
+
+    inline
+    void
+    make(const string *base,
+         const char   *suffix,
+         string       &output)
+    {
+      output  = *base;
+      output += suffix;
+    }
  }
 };

@@ -0,0 +1,40 @@
+/*
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include <errno.h>
+
+#if defined __linux__
+#include <sys/sendfile.h>
+#endif
+
+#include "fs_sendfile.hpp"
+
+namespace fs
+{
+  ssize_t
+  sendfile(const int    fdin,
+           const int    fdout,
+           const size_t count)
+  {
+#if defined __linux__
+    off_t offset = 0;
+
+    return ::sendfile(fdout,fdin,&offset,count);
+#else
+    return (errno=EINVAL,-1);
+#endif
+  }
+}
@@ -0,0 +1,28 @@
+/*
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#ifndef __FS_SENDFILE_HPP__
+#define __FS_SENDFILE_HPP__
+
+namespace fs
+{
+  ssize_t
+  sendfile(const int    fdin,
+           const int    fdout,
+           const size_t count);
+}
+
+#endif // __FS_SENDFILE_HPP__
@@ -1,32 +1,24 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include <stdlib.h>
-#include <sys/types.h>
-#include <attr/xattr.h>
-#include <sys/stat.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>

 #include <string>
@@ -52,23 +44,23 @@ namespace fs
    {
 #ifndef WITHOUT_XATTR
      ssize_t rv;
-      ssize_t size;

      rv    = -1;
      errno = ERANGE;
-      while(rv == -1 && errno == ERANGE)
+      while((rv == -1) && (errno == ERANGE))
        {
-          size = ::flistxattr(fd,NULL,0);
-          attrs.resize(size);
-          if(size == 0)
-            return 0;
-          rv = ::flistxattr(fd,&attrs[0],size);
+          rv = ::flistxattr(fd,NULL,0);
+          if(rv <= 0)
+            return rv;
+
+          attrs.resize(rv);
+
+          rv = ::flistxattr(fd,&attrs[0],rv);
        }

      return rv;
 #else
-      errno = ENOTSUP;
-      return -1;
+      return (errno=ENOTSUP,-1);
 #endif
    }

@@ -77,24 +69,24 @@ namespace fs
         vector<char> &attrs)
    {
 #ifndef WITHOUT_XATTR
-      int rv;
-      int size;
+      ssize_t rv;

      rv    = -1;
      errno = ERANGE;
-      while(rv == -1 && errno == ERANGE)
+      while((rv == -1) && (errno == ERANGE))
        {
-          size = ::listxattr(path.c_str(),NULL,0);
-          attrs.resize(size);
-          if(size == 0)
-            return 0;
-          rv = ::listxattr(path.c_str(),&attrs[0],size);
+          rv = ::llistxattr(path.c_str(),NULL,0);
+          if(rv <= 0)
+            return rv;
+
+          attrs.resize(rv);
+
+          rv = ::llistxattr(path.c_str(),&attrs[0],rv);
        }

      return rv;
 #else
-      errno = ENOTSUP;
-      return -1;
+      return (errno=ENOTSUP,-1);
 #endif
    }

@@ -134,7 +126,7 @@ namespace fs

    int
    list(const int  fd,
-          string   &attrstr)
+         string    &attrstr)
    {
      int rv;
      vector<char> attrs;
@@ -166,24 +158,24 @@ namespace fs
        vector<char> &value)
    {
 #ifndef WITHOUT_XATTR
-      int rv;
-      int size;
+      ssize_t rv;

      rv    = -1;
      errno = ERANGE;
-      while(rv == -1 && errno == ERANGE)
+      while((rv == -1) && (errno == ERANGE))
        {
-          size = ::fgetxattr(fd,attr.c_str(),NULL,0);
-          value.resize(size);
-          if(size == 0)
-            return 0;
-          rv = ::fgetxattr(fd,attr.c_str(),&value[0],size);
+          rv = ::fgetxattr(fd,attr.c_str(),NULL,0);
+          if(rv <= 0)
+            return rv;
+
+          value.resize(rv);
+
+          rv = ::fgetxattr(fd,attr.c_str(),&value[0],rv);
        }

      return rv;
 #else
-      errno = ENOTSUP;
-      return -1;
+      return (errno=ENOTSUP,-1);
 #endif
    }

@@ -193,24 +185,24 @@ namespace fs
        vector<char> &value)
    {
 #ifndef WITHOUT_XATTR
-      int rv;
-      int size;
+      ssize_t rv;

      rv    = -1;
      errno = ERANGE;
-      while(rv == -1 && errno == ERANGE)
+      while((rv == -1) && (errno == ERANGE))
        {
-          size = ::getxattr(path.c_str(),attr.c_str(),NULL,0);
-          value.resize(size);
-          if(size == 0)
-            return 0;
-          rv = ::getxattr(path.c_str(),attr.c_str(),&value[0],size);
+          rv = ::lgetxattr(path.c_str(),attr.c_str(),NULL,0);
+          if(rv <= 0)
+            return rv;
+
+          value.resize(rv);
+
+          rv = ::lgetxattr(path.c_str(),attr.c_str(),&value[0],rv);
        }

      return rv;
 #else
-      errno = ENOTSUP;
-      return -1;
+      return (errno=ENOTSUP,-1);
 #endif
    }

@@ -313,8 +305,7 @@ namespace fs
                         value.size(),
                         flags);
 #else
-      errno = ENOTSUP;
-      return -1;
+      return (errno=ENOTSUP,-1);
 #endif
    }

@@ -325,14 +316,13 @@ namespace fs
        const int     flags)
    {
 #ifndef WITHOUT_XATTR
-      return ::setxattr(path.c_str(),
-                        key.c_str(),
-                        value.data(),
-                        value.size(),
-                        flags);
+      return ::lsetxattr(path.c_str(),
+                         key.c_str(),
+                         value.data(),
+                         value.size(),
+                         flags);
 #else
-      errno = ENOTSUP;
-      return -1;
+      return (errno=ENOTSUP,-1);
 #endif
    }

@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __FS_XATTR_HPP__
@@ -38,7 +30,7 @@ namespace fs
    using std::vector;
    using std::map;

-  
+
    int list(const string   &path,
             vector<char>   &attrs);
    int list(const string   &path,
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef _GNU_SOURCE
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <string>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __FUSEFUNC_HPP__
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -71,19 +63,20 @@ int
 _getattr(Policy::Func::Search  searchFunc,
         const vector<string> &srcmounts,
         const size_t          minfreespace,
-         const string         &fusepath,
+         const char           *fusepath,
         struct stat          &buf)
 {
  int rv;
-  vector<string> path;
+  string fullpath;
+  vector<const string*> basepaths;

-  rv = searchFunc(srcmounts,fusepath,minfreespace,path);
+  rv = searchFunc(srcmounts,fusepath,minfreespace,basepaths);
  if(rv == -1)
    return -errno;

-  fs::path::append(path[0],fusepath);
+  fs::path::make(basepaths[0],fusepath,fullpath);

-  rv = ::lstat(path[0].c_str(),&buf);
+  rv = ::lstat(fullpath.c_str(),&buf);

  return ((rv == -1) ? -errno : 0);
 }
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <sys/types.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -29,10 +21,11 @@
 #include <set>
 #include <algorithm>

-#include <stdio.h>
 #include <errno.h>
-#include <sys/types.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
+#include <unistd.h>

 #include "config.hpp"
 #include "fs_path.hpp"
@@ -50,18 +43,18 @@ using namespace mergerfs;
 static
 int
 _lgetxattr(const string &path,
-           const string &name,
+           const char   *attrname,
           void         *value,
           const size_t  size)
 {
 #ifndef WITHOUT_XATTR
  int rv;

-  rv = ::lgetxattr(path.c_str(),name.c_str(),value,size);
+  rv = ::lgetxattr(path.c_str(),attrname,value,size);

  return ((rv == -1) ? -errno : rv);
 #else
-  return -ENOSUP;
+  return -ENOTSUP;
 #endif
 }

@@ -152,10 +145,23 @@ _getxattr_controlfile_version(string &attrvalue)
  attrvalue = MERGERFS_VERSION;
 }

+static
+void
+_getxattr_pid(string &attrvalue)
+{
+  int pid;
+  char buf[32];
+
+  pid = getpid();
+  snprintf(buf,sizeof(buf),"%d",pid);
+
+  attrvalue = buf;
+}
+
 static
 int
 _getxattr_controlfile(const Config &config,
-                      const string &attrname,
+                      const char   *attrname,
                      char         *buf,
                      const size_t  count)
 {
@@ -180,6 +186,8 @@ _getxattr_controlfile(const Config &config,
        _getxattr_controlfile_policies(config,attrvalue);
      else if(attr[2] == "version")
        _getxattr_controlfile_version(attrvalue);
+      else if(attr[2] == "pid")
+        _getxattr_pid(attrvalue);
      break;

    case 4:
@@ -228,7 +236,7 @@ _getxattr_from_string(char         *destbuf,
 static
 int
 _getxattr_user_mergerfs_allpaths(const vector<string> &srcmounts,
-                                 const string         &fusepath,
+                                 const char           *fusepath,
                                 char                 *buf,
                                 const size_t          count)
 {
@@ -245,10 +253,10 @@ _getxattr_user_mergerfs_allpaths(const vector<string> &srcmounts,
 static
 int
 _getxattr_user_mergerfs(const string         &basepath,
-                        const string         &fusepath,
+                        const char           *fusepath,
                        const string         &fullpath,
                        const vector<string> &srcmounts,
-                        const string         &attrname,
+                        const char           *attrname,
                        char                 *buf,
                        const size_t          count)
 {
@@ -273,23 +281,23 @@ int
 _getxattr(Policy::Func::Search  searchFunc,
          const vector<string> &srcmounts,
          const size_t          minfreespace,
-          const string         &fusepath,
-          const string         &attrname,
+          const char           *fusepath,
+          const char           *attrname,
          char                 *buf,
          const size_t          count)
 {
  int rv;
  string fullpath;
-  vector<string> basepath;
+  vector<const string*> basepaths;

-  rv = searchFunc(srcmounts,fusepath,minfreespace,basepath);
+  rv = searchFunc(srcmounts,fusepath,minfreespace,basepaths);
  if(rv == -1)
    return -errno;

-  fs::path::make(basepath[0],fusepath,fullpath);
+  fs::path::make(basepaths[0],fusepath,fullpath);

  if(str::isprefix(attrname,"user.mergerfs."))
-    rv = _getxattr_user_mergerfs(basepath[0],fusepath,fullpath,srcmounts,attrname,buf,count);
+    rv = _getxattr_user_mergerfs(*basepaths[0],fusepath,fullpath,srcmounts,attrname,buf,count);
  else
    rv = _lgetxattr(fullpath,attrname,buf,count);

@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2015 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <stdlib.h>
@@ -28,11 +20,16 @@
 #include <grp.h>
 #include <unistd.h>

+#if defined __linux__ and UGID_USE_RWLOCK == 0
+# include <sys/syscall.h>
+#endif
+
 #include <cstdlib>
 #include <algorithm>

 #include "gidcache.hpp"

+inline
 bool
 gid_t_rec::operator<(const struct gid_t_rec &b) const
 {
@@ -110,7 +107,7 @@ gid_t_cache::cache(const uid_t uid,
  if(pwdrv != NULL && rv == 0)
    {
      rec->size = 0;
-      rv = ::getgrouplist(pwd.pw_name,gid,NULL,&rec->size);
+      ::getgrouplist(pwd.pw_name,gid,NULL,&rec->size);
      rec->size = std::min(MAXGIDS,rec->size);
      rv = ::getgrouplist(pwd.pw_name,gid,rec->gids,&rec->size);
      if(rv == -1)
@@ -123,21 +120,36 @@ gid_t_cache::cache(const uid_t uid,
  return rec;
 }

-void
+static
+inline
+int
+setgroups(const gid_t_rec *rec)
+{
+#if defined __linux__ and UGID_USE_RWLOCK == 0
+  return ::syscall(SYS_setgroups,rec->size,rec->gids);
+#else
+  return ::setgroups(rec->size,rec->gids);
+#endif
+}
+
+int
 gid_t_cache::initgroups(const uid_t uid,
                        const gid_t gid)
 {
+  int rv;
  gid_t_rec *rec;

  rec = lower_bound(begin(),end(),uid);
  if(rec == end() || rec->uid != uid)
    {
      rec = cache(uid,gid);
-      ::setgroups(rec->size,rec->gids);
+      rv = ::setgroups(rec);
      std::sort(begin(),end());
    }
  else
    {
-      ::setgroups(rec->size,rec->gids);
+      rv = ::setgroups(rec);
    }
+
+  return rv;
 }
@@ -1,25 +1,17 @@
 /*
-  The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-  Copyright (c) 2015 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __GIDCACHE_HPP__
@@ -58,7 +50,7 @@ private:
                    const gid_t gid);

 public:
-  void
+  int
  initgroups(const uid_t uid,
             const gid_t gid);
 };
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -28,8 +20,10 @@
 #include <vector>

 #include <errno.h>
+#include <fcntl.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
+#include <sys/stat.h>
+#include <sys/types.h>

 #include "config.hpp"
 #include "fileinfo.hpp"
@@ -56,10 +50,6 @@ _ioctl(const int  fd,

 #ifdef FUSE_IOCTL_DIR

-#ifndef O_DIRECTORY
-#define O_DIRECTORY 0
-#endif
-
 #ifndef O_NOATIME
 #define O_NOATIME 0
 #endif
@@ -69,21 +59,23 @@ int
 _ioctl_dir_base(Policy::Func::Search  searchFunc,
                const vector<string> &srcmounts,
                const size_t          minfreespace,
-                const string         &fusepath,
+                const char           *fusepath,
                const int             cmd,
                void                 *data)
 {
  int fd;
  int rv;
-  vector<string> path;
+  string fullpath;
+  vector<const string*> basepaths;

-  rv = searchFunc(srcmounts,fusepath,minfreespace,path);
+  rv = searchFunc(srcmounts,fusepath,minfreespace,basepaths);
  if(rv == -1)
    return -errno;

-  fs::path::append(path[0],fusepath);
+  fs::path::make(basepaths[0],fusepath,fullpath);

-  fd = ::open(path[0].c_str(),O_RDWR|O_NOATIME|O_DIRECTORY);
+  const int flags = O_RDONLY | O_NOATIME | O_NONBLOCK;
+  fd = ::open(fullpath.c_str(),flags);
  if(fd == -1)
    return -errno;

@@ -96,9 +88,9 @@ _ioctl_dir_base(Policy::Func::Search  searchFunc,

 static
 int
-_ioctl_dir(const string &fusepath,
-           const int     cmd,
-           void         *data)
+_ioctl_dir(const char *fusepath,
+           const int   cmd,
+           void       *data)
 {
  const fuse_context      *fc     = fuse_get_context();
  const Config            &config = Config::get(fc);
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -33,6 +25,7 @@
 #include "config.hpp"
 #include "fs_clonepath.hpp"
 #include "fs_path.hpp"
+#include "rv.hpp"
 #include "rwlock.hpp"
 #include "ugid.hpp"

@@ -43,34 +36,118 @@ using namespace mergerfs;

 static
 int
-_single_link(Policy::Func::Search  searchFunc,
-             const vector<string> &srcmounts,
-             const size_t          minfreespace,
-             const string         &base,
-             const string         &oldpath,
-             const string         &newpath)
+_link_create_path_core(const string &oldbasepath,
+                       const string &newbasepath,
+                       const char   *oldfusepath,
+                       const char   *newfusepath,
+                       const string &newfusedirpath,
+                       const int     error)
 {
  int rv;
-  const string fulloldpath = fs::path::make(base,oldpath);
-  const string fullnewpath = fs::path::make(base,newpath);
+  string oldfullpath;
+  string newfullpath;

-  rv = ::link(fulloldpath.c_str(),fullnewpath.c_str());
-  if(rv == -1 && errno == ENOENT)
+  if(oldbasepath != newbasepath)
    {
-      string newpathdir;
-      vector<string> foundpath;
+      const ugid::SetRootGuard ugidGuard;
+      fs::clonepath(newbasepath,oldbasepath,newfusedirpath.c_str());
+    }

-      newpathdir = fs::path::dirname(newpath);
-      rv = searchFunc(srcmounts,newpathdir,minfreespace,foundpath);
-      if(rv == -1)
-        return -1;
+  fs::path::make(&oldbasepath,oldfusepath,oldfullpath);
+  fs::path::make(&oldbasepath,newfusepath,newfullpath);

-      {
-        const ugid::SetRootGuard ugidGuard;
-        fs::clonepath(foundpath[0],base,newpathdir);
-      }
+  rv = ::link(oldfullpath.c_str(),newfullpath.c_str());

-      rv = ::link(fulloldpath.c_str(),fullnewpath.c_str());
+  return calc_error(rv,error,errno);
+}
+
+static
+int
+_link_create_path_loop(const vector<const string*> &oldbasepaths,
+                       const string                &newbasepath,
+                       const char                  *oldfusepath,
+                       const char                  *newfusepath,
+                       const string                &newfusedirpath)
+{
+  int error;
+
+  error = -1;
+  for(size_t i = 0, ei = oldbasepaths.size(); i != ei; i++)
+    {
+      error = _link_create_path_core(*oldbasepaths[i],newbasepath,
+                                     oldfusepath,newfusepath,
+                                     newfusedirpath,
+                                     error);
+    }
+
+  return -error;
+}
+
+static
+int
+_link_create_path(Policy::Func::Search  searchFunc,
+                  Policy::Func::Action  actionFunc,
+                  const vector<string> &srcmounts,
+                  const size_t          minfreespace,
+                  const char           *oldfusepath,
+                  const char           *newfusepath)
+{
+  int rv;
+  string newfusedirpath;
+  vector<const string*> oldbasepaths;
+  vector<const string*> newbasepaths;
+
+  rv = actionFunc(srcmounts,oldfusepath,minfreespace,oldbasepaths);
+  if(rv == -1)
+    return -errno;
+
+  newfusedirpath = newfusepath;
+  fs::path::dirname(newfusedirpath);
+  rv = searchFunc(srcmounts,newfusedirpath.c_str(),minfreespace,newbasepaths);
+  if(rv == -1)
+    return -errno;
+
+  return _link_create_path_loop(oldbasepaths,*newbasepaths[0],
+                                oldfusepath,newfusepath,
+                                newfusedirpath);
+}
+
+static
+int
+_clonepath_if_would_create(Policy::Func::Search  searchFunc,
+                           Policy::Func::Create  createFunc,
+                           const vector<string> &srcmounts,
+                           const size_t          minfreespace,
+                           const string         &oldbasepath,
+                           const char           *oldfusepath,
+                           const char           *newfusepath)
+{
+  int rv;
+  string newfusedirpath;
+  const char *newfusedirpathcstr;
+  vector<const string*> newbasepath;
+
+  newfusedirpath = newfusepath;
+  fs::path::dirname(newfusedirpath);
+  newfusedirpathcstr = newfusedirpath.c_str();
+
+  rv = createFunc(srcmounts,newfusedirpathcstr,minfreespace,newbasepath);
+  if(rv != -1)
+    {
+      if(oldbasepath == *newbasepath[0])
+        {
+          rv = searchFunc(srcmounts,newfusedirpathcstr,minfreespace,newbasepath);
+          if(rv != -1)
+            {
+              const ugid::SetRootGuard ugidGuard;
+              fs::clonepath(*newbasepath[0],oldbasepath,newfusedirpathcstr);
+            }
+        }
+      else
+        {
+          rv = -1;
+          errno = EXDEV;
+        }
    }

  return rv;
@@ -78,32 +155,84 @@ _single_link(Policy::Func::Search  searchFunc,

 static
 int
-_link(Policy::Func::Search  searchFunc,
-      Policy::Func::Action  actionFunc,
-      const vector<string> &srcmounts,
-      const size_t          minfreespace,
-      const string         &oldpath,
-      const string         &newpath)
+_link_preserve_path_core(Policy::Func::Search  searchFunc,
+                         Policy::Func::Create  createFunc,
+                         const vector<string> &srcmounts,
+                         const size_t          minfreespace,
+                         const string         &oldbasepath,
+                         const char           *oldfusepath,
+                         const char           *newfusepath,
+                         const int             error)
 {
  int rv;
-  int error;
-  vector<string> oldpaths;
+  string oldfullpath;
+  string newfullpath;

-  rv = actionFunc(srcmounts,oldpath,minfreespace,oldpaths);
-  if(rv == -1)
-    return -errno;
+  fs::path::make(&oldbasepath,oldfusepath,oldfullpath);
+  fs::path::make(&oldbasepath,newfusepath,newfullpath);

-  error = 0;
-  for(size_t i = 0, ei = oldpaths.size(); i != ei; i++)
+  rv = ::link(oldfullpath.c_str(),newfullpath.c_str());
+  if((rv == -1) && (errno == ENOENT))
    {
-      rv = _single_link(searchFunc,srcmounts,minfreespace,oldpaths[i],oldpath,newpath);
-      if(rv == -1)
-        error = errno;
+      rv = _clonepath_if_would_create(searchFunc,createFunc,
+                                      srcmounts,minfreespace,
+                                      oldbasepath,
+                                      oldfusepath,newfusepath);
+      if(rv != -1)
+        rv = ::link(oldfullpath.c_str(),newfullpath.c_str());
+    }
+
+  return calc_error(rv,error,errno);
+}
+
+static
+int
+_link_preserve_path_loop(Policy::Func::Search         searchFunc,
+                         Policy::Func::Create         createFunc,
+                         const vector<string>        &srcmounts,
+                         const size_t                 minfreespace,
+                         const char                  *oldfusepath,
+                         const char                  *newfusepath,
+                         const vector<const string*> &oldbasepaths)
+{
+  int error;
+
+  error = -1;
+  for(size_t i = 0, ei = oldbasepaths.size(); i != ei; i++)
+    {
+      error = _link_preserve_path_core(searchFunc,createFunc,
+                                       srcmounts,minfreespace,
+                                       *oldbasepaths[i],
+                                       oldfusepath,newfusepath,
+                                       error);
    }

  return -error;
 }

+static
+int
+_link_preserve_path(Policy::Func::Search  searchFunc,
+                    Policy::Func::Action  actionFunc,
+                    Policy::Func::Create  createFunc,
+                    const vector<string> &srcmounts,
+                    const size_t          minfreespace,
+                    const char          *oldfusepath,
+                    const char          *newfusepath)
+{
+  int rv;
+  vector<const string*> oldbasepaths;
+
+  rv = actionFunc(srcmounts,oldfusepath,minfreespace,oldbasepaths);
+  if(rv == -1)
+    return -errno;
+
+  return _link_preserve_path_loop(searchFunc,createFunc,
+                                  srcmounts,minfreespace,
+                                  oldfusepath,newfusepath,
+                                  oldbasepaths);
+}
+
 namespace mergerfs
 {
  namespace fuse
@@ -117,12 +246,21 @@ namespace mergerfs
      const ugid::Set          ugid(fc->uid,fc->gid);
      const rwlock::ReadGuard  readlock(&config.srcmountslock);

-      return _link(config.getattr,
-                   config.link,
-                   config.srcmounts,
-                   config.minfreespace,
-                   from,
-                   to);
+      if(config.create->path_preserving())
+        return _link_preserve_path(config.getattr,
+                                   config.link,
+                                   config.create,
+                                   config.srcmounts,
+                                   config.minfreespace,
+                                   from,
+                                   to);
+
+      return _link_create_path(config.link,
+                               config.create,
+                               config.srcmounts,
+                               config.minfreespace,
+                               from,
+                               to);
    }
  }
 }
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -55,7 +47,8 @@ _listxattr_controlfile(char         *list,
    ("user.mergerfs.minfreespace")
    ("user.mergerfs.moveonenospc")
    ("user.mergerfs.policies")
-    ("user.mergerfs.version");
+    ("user.mergerfs.version")
+    ("user.mergerfs.pid");

  xattrs.reserve(1024);
  for(size_t i = 0; i < strs.size(); i++)
@@ -76,32 +69,31 @@ _listxattr_controlfile(char         *list,
  return xattrs.size();
 }

+#ifndef WITHOUT_XATTR
 static
 int
 _listxattr(Policy::Func::Search  searchFunc,
           const vector<string> &srcmounts,
           const size_t          minfreespace,
-           const string         &fusepath,
+           const char           *fusepath,
           char                 *list,
           const size_t          size)
 {
-#ifndef WITHOUT_XATTR
  int rv;
-  vector<string> path;
+  string fullpath;
+  vector<const string*> basepaths;

-  rv = searchFunc(srcmounts,fusepath,minfreespace,path);
+  rv = searchFunc(srcmounts,fusepath,minfreespace,basepaths);
  if(rv == -1)
    return -errno;

-  fs::path::append(path[0],fusepath);
+  fs::path::make(basepaths[0],fusepath,fullpath);

-  rv = ::llistxattr(path[0].c_str(),list,size);
+  rv = ::llistxattr(fullpath.c_str(),list,size);

  return ((rv == -1) ? -errno : rv);
-#else
-  return -ENOTSUP;
-#endif
 }
+#endif

 namespace mergerfs
 {
@@ -118,6 +110,7 @@ namespace mergerfs
      if(fusepath == config.controlfile)
        return _listxattr_controlfile(list,size);

+#ifndef WITHOUT_XATTR
      const ugid::Set         ugid(fc->uid,fc->gid);
      const rwlock::ReadGuard readlock(&config.srcmountslock);

@@ -127,6 +120,9 @@ namespace mergerfs
                        fusepath,
                        list,
                        size);
+#else
+      return -ENOTSUP;
+#endif
    }
  }
 }
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,26 +1,18 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
- */
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/

 #include <fuse.h>
 #include <string.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __MERGER_HPP__
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -34,6 +26,7 @@
 #include "config.hpp"
 #include "fs_clonepath.hpp"
 #include "fs_path.hpp"
+#include "rv.hpp"
 #include "rwlock.hpp"
 #include "ugid.hpp"

@@ -42,50 +35,80 @@ using std::vector;
 using mergerfs::Policy;
 using namespace mergerfs;

+static
+int
+_mkdir_loop_core(const string &existingpath,
+                 const string &createpath,
+                 const char   *fusepath,
+                 const char   *fusedirpath,
+                 const mode_t  mode,
+                 const int     error)
+{
+  int rv;
+  string fullpath;
+
+  if(createpath != existingpath)
+    {
+      const ugid::SetRootGuard ugidGuard;
+      fs::clonepath(existingpath,createpath,fusedirpath);
+    }
+
+  fs::path::make(&createpath,fusepath,fullpath);
+
+  rv = ::mkdir(fullpath.c_str(),mode);
+
+  return calc_error(rv,error,errno);
+}
+
+static
+int
+_mkdir_loop(const string                &existingpath,
+            const vector<const string*> &createpaths,
+            const char                  *fusepath,
+            const char                  *fusedirpath,
+            const mode_t                 mode)
+{
+  int error;
+
+  error = -1;
+  for(size_t i = 0, ei = createpaths.size(); i != ei; i++)
+    {
+      error = _mkdir_loop_core(existingpath,*createpaths[i],
+                               fusepath,fusedirpath,mode,error);
+    }
+
+  return -error;
+}
+
 static
 int
 _mkdir(Policy::Func::Search  searchFunc,
       Policy::Func::Create  createFunc,
       const vector<string> &srcmounts,
       const size_t          minfreespace,
-       const string         &fusepath,
+       const char           *fusepath,
       const mode_t          mode)
 {
  int rv;
-  int error;
-  string dirname;
-  string fullpath;
-  vector<string> createpaths;
-  vector<string> existingpath;
+  string fusedirpath;
+  const char *fusedirpathcstr;
+  vector<const string*> createpaths;
+  vector<const string*> existingpaths;

-  dirname = fs::path::dirname(fusepath);
-  rv = searchFunc(srcmounts,dirname,minfreespace,existingpath);
+  fusedirpath = fusepath;
+  fs::path::dirname(fusedirpath);
+  fusedirpathcstr = fusedirpath.c_str();
+
+  rv = searchFunc(srcmounts,fusedirpathcstr,minfreespace,existingpaths);
  if(rv == -1)
    return -errno;

-  rv = createFunc(srcmounts,dirname,minfreespace,createpaths);
+  rv = createFunc(srcmounts,fusedirpathcstr,minfreespace,createpaths);
  if(rv == -1)
    return -errno;

-  error = 0;
-  for(size_t i = 0, ei = createpaths.size(); i != ei; i++)
-    {
-      string &createpath = createpaths[i];
-
-      if(createpath != existingpath[0])
-        {
-          const ugid::SetRootGuard ugidGuard;
-          fs::clonepath(existingpath[0],createpath,dirname);
-        }
-
-      fs::path::append(createpath,fusepath);
-
-      rv = ::mkdir(createpath.c_str(),mode);
-      if(rv == -1)
-        error = errno;
-    }
-
-  return -error;
+  return _mkdir_loop(*existingpaths[0],createpaths,
+                     fusepath,fusedirpathcstr,mode);
 }

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -36,6 +28,7 @@
 #include "config.hpp"
 #include "fs_clonepath.hpp"
 #include "fs_path.hpp"
+#include "rv.hpp"
 #include "rwlock.hpp"
 #include "ugid.hpp"

@@ -43,50 +36,85 @@ using std::string;
 using std::vector;
 using namespace mergerfs;

+static
+int
+_mknod_loop_core(const string &existingpath,
+                 const string &createpath,
+                 const char   *fusepath,
+                 const char   *fusedirpath,
+                 const mode_t  mode,
+                 const dev_t   dev,
+                 const int     error)
+{
+  int rv;
+  string fullpath;
+
+  if(createpath != existingpath)
+    {
+      const ugid::SetRootGuard ugidGuard;
+      fs::clonepath(existingpath,createpath,fusedirpath);
+    }
+
+  fs::path::make(&createpath,fusepath,fullpath);
+
+  rv = ::mknod(fullpath.c_str(),mode,dev);
+
+  return calc_error(rv,error,errno);
+}
+
+static
+int
+_mknod_loop(const string                &existingpath,
+            const vector<const string*> &createpaths,
+            const char                  *fusepath,
+            const char                  *fusedirpath,
+            const mode_t                 mode,
+            const dev_t                  dev)
+{
+  int error;
+
+  error = -1;
+  for(size_t i = 0, ei = createpaths.size(); i != ei; i++)
+    {
+      error = _mknod_loop_core(existingpath,*createpaths[i],
+                               fusepath,fusedirpath,
+                               mode,dev,error);
+    }
+
+  return -error;
+}
+
 static
 int
 _mknod(Policy::Func::Search  searchFunc,
       Policy::Func::Create  createFunc,
       const vector<string> &srcmounts,
       const size_t          minfreespace,
-       const string         &fusepath,
+       const char           *fusepath,
       const mode_t          mode,
       const dev_t           dev)
 {
  int rv;
-  int error;
-  string dirname;
-  vector<string> createpaths;
-  vector<string> existingpath;
+  string fusedirpath;
+  const char *fusedirpathcstr;
+  vector<const string*> createpaths;
+  vector<const string*> existingpaths;

-  dirname = fs::path::dirname(fusepath);
-  rv = searchFunc(srcmounts,dirname,minfreespace,existingpath);
+  fusedirpath = fusepath;
+  fs::path::dirname(fusedirpath);
+  fusedirpathcstr = fusedirpath.c_str();
+
+  rv = searchFunc(srcmounts,fusedirpathcstr,minfreespace,existingpaths);
  if(rv == -1)
    return -errno;

-  rv = createFunc(srcmounts,dirname,minfreespace,createpaths);
+  rv = createFunc(srcmounts,fusedirpathcstr,minfreespace,createpaths);
  if(rv == -1)
    return -errno;

-  error = 0;
-  for(size_t i = 0, ei = createpaths.size(); i != ei; i++)
-    {
-      string &createpath = createpaths[0];
-
-      if(createpath != existingpath[0])
-        {
-          const ugid::SetRootGuard ugidGuard;
-          fs::clonepath(existingpath[0],createpath,dirname);
-        }
-
-      fs::path::append(createpath,fusepath);
-
-      rv = ::mknod(createpath.c_str(),mode,dev);
-      if(rv == -1)
-        error = errno;
-    }
-
-  return -error;
+  return _mknod_loop(*existingpaths[0],createpaths,
+                     fusepath,fusedirpathcstr,
+                     mode,dev);
 }

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 namespace mergerfs
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <stdlib.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <string>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -43,24 +35,17 @@ using mergerfs::Policy;

 static
 int
-_open(Policy::Func::Search  searchFunc,
-      const vector<string> &srcmounts,
-      const size_t          minfreespace,
-      const string         &fusepath,
-      const int             flags,
-      uint64_t             &fh)
+_open_core(const string *basepath,
+           const char   *fusepath,
+           const int     flags,
+           uint64_t     &fh)
 {
  int fd;
-  int rv;
-  vector<string> path;
+  string fullpath;

-  rv = searchFunc(srcmounts,fusepath,minfreespace,path);
-  if(rv == -1)
-    return -errno;
+  fs::path::make(basepath,fusepath,fullpath);

-  fs::path::append(path[0],fusepath);
-
-  fd = ::open(path[0].c_str(),flags);
+  fd = ::open(fullpath.c_str(),flags);
  if(fd == -1)
    return -errno;

@@ -69,6 +54,25 @@ _open(Policy::Func::Search  searchFunc,
  return 0;
 }

+static
+int
+_open(Policy::Func::Search  searchFunc,
+      const vector<string> &srcmounts,
+      const size_t          minfreespace,
+      const char           *fusepath,
+      const int             flags,
+      uint64_t             &fh)
+{
+  int rv;
+  vector<const string*> basepaths;
+
+  rv = searchFunc(srcmounts,fusepath,minfreespace,basepaths);
+  if(rv == -1)
+    return -errno;
+
+  return _open_core(basepaths[0],fusepath,flags,fh);
+}
+
 namespace mergerfs
 {
  namespace fuse
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <vector>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -196,7 +188,6 @@ process_opt(Config            &config,
  int rv;
  std::vector<std::string> argvalue;

-  rv = 1;
  str::split(argvalue,arg,'=');
  switch(argvalue.size())
    {
@@ -333,6 +324,7 @@ namespace mergerfs
          FUSE_OPT_KEY("-h",MERGERFS_OPT_HELP),
          FUSE_OPT_KEY("--help",MERGERFS_OPT_HELP),
          FUSE_OPT_KEY("-v",MERGERFS_OPT_VERSION),
+          FUSE_OPT_KEY("-V",MERGERFS_OPT_VERSION),
          FUSE_OPT_KEY("--version",MERGERFS_OPT_VERSION),
          {NULL,-1U,0}
        };
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <fuse.h>
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <vector>
@@ -28,27 +20,26 @@
 #include "fs.hpp"
 #include "buildvector.hpp"

-#define POLICY(X) (Policy(Policy::Enum::X,#X,Policy::Func::X))
+#define POLICY(X,PP) (Policy(Policy::Enum::X,#X,Policy::Func::X,PP))
+#define PRESERVES_PATH true
+#define DOESNT_PRESERVE_PATH false

 namespace mergerfs
 {
  const std::vector<Policy> Policy::_policies_ =
    buildvector<Policy,true>
-    (POLICY(invalid))
-    (POLICY(all))
-    (POLICY(einval))
-    (POLICY(enosys))
-    (POLICY(enotsup))
-    (POLICY(epmfs))
-    (POLICY(erofs))
-    (POLICY(exdev))
-    (POLICY(ff))
-    (POLICY(ffwp))
-    (POLICY(fwfs))
-    (POLICY(lfs))
-    (POLICY(mfs))
-    (POLICY(newest))
-    (POLICY(rand));
+    (POLICY(invalid,DOESNT_PRESERVE_PATH))
+    (POLICY(all,DOESNT_PRESERVE_PATH))
+    (POLICY(eplfs,PRESERVES_PATH))
+    (POLICY(eplus,PRESERVES_PATH))
+    (POLICY(epmfs,PRESERVES_PATH))
+    (POLICY(erofs,DOESNT_PRESERVE_PATH))
+    (POLICY(ff,DOESNT_PRESERVE_PATH))
+    (POLICY(lfs,DOESNT_PRESERVE_PATH))
+    (POLICY(lus,DOESNT_PRESERVE_PATH))
+    (POLICY(mfs,DOESNT_PRESERVE_PATH))
+    (POLICY(newest,DOESNT_PRESERVE_PATH))
+    (POLICY(rand,DOESNT_PRESERVE_PATH));

  const Policy * const Policy::policies = &_policies_[1];

@@ -56,16 +47,13 @@ namespace mergerfs

  CONST_POLICY(invalid);
  CONST_POLICY(all);
-  CONST_POLICY(einval);
-  CONST_POLICY(enosys);
-  CONST_POLICY(enotsup);
+  CONST_POLICY(eplfs);
+  CONST_POLICY(eplus);
  CONST_POLICY(epmfs);
  CONST_POLICY(erofs);
-  CONST_POLICY(exdev);
  CONST_POLICY(ff);
-  CONST_POLICY(ffwp);
-  CONST_POLICY(fwfs);
  CONST_POLICY(lfs);
+  CONST_POLICY(lus);
  CONST_POLICY(mfs);
  CONST_POLICY(newest);
  CONST_POLICY(rand);
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #ifndef __POLICY_HPP__
@@ -32,6 +24,13 @@
 #include "fs.hpp"
 #include "category.hpp"

+#define POLICY_SUCCESS 0
+#define POLICY_FAIL -1
+#define POLICY_SUCCEEDED(RV) ((RV) == POLICY_SUCCESS)
+#define POLICY_FAILED(RV) ((RV) == POLICY_FAIL)
+#define POLICY_FAIL_ERRNO(ERRNO) (errno=ERRNO,POLICY_FAIL)
+#define POLICY_FAIL_ENOENT POLICY_FAIL_ERRNO(ENOENT)
+
 namespace mergerfs
 {
  class Policy
@@ -44,16 +43,13 @@ namespace mergerfs
          invalid = -1,
          BEGIN   = 0,
          all     = BEGIN,
-          einval,
-          enosys,
-          enotsup,
+          eplfs,
+          eplus,
          epmfs,
          erofs,
-          exdev,
          ff,
-          ffwp,
-          fwfs,
          lfs,
+          lus,
          mfs,
          newest,
          rand,
@@ -69,103 +65,82 @@ namespace mergerfs
      typedef std::string string;
      typedef std::size_t size_t;
      typedef std::vector<string> strvec;
+      typedef std::vector<const string*> cstrptrvec;
      typedef const string cstring;
      typedef const size_t csize_t;
      typedef const strvec cstrvec;
      typedef const Category::Enum::Type CType;

-      typedef int (*Ptr)(CType,cstrvec&,cstring&,csize_t,strvec&);
+      typedef int (*Ptr)(CType,cstrvec &,const char *,csize_t,cstrptrvec &);

-      class Action
+      template <CType T>
+      class Base
      {
      public:
-        Action(const Policy *p)
+        Base(const Policy *p)
          : func(p->_func)
        {}

        int
-        operator()(cstrvec& b,cstring& c,csize_t d,strvec& e)
+        operator()(cstrvec &b,const char *c,csize_t d,cstrptrvec &e)
        {
-          return func(Category::Enum::action,b,c,d,e);
+          return func(T,b,c,d,e);
        }

      private:
        const Ptr func;
      };

-      class Create
-      {
-      public:
-        Create(const Policy *p)
-          : func(p->_func)
-        {}
+      typedef Base<Category::Enum::action> Action;
+      typedef Base<Category::Enum::create> Create;
+      typedef Base<Category::Enum::search> Search;

-        int
-        operator()(cstrvec& b,cstring& c,csize_t d,strvec& e)
-        {
-          return func(Category::Enum::create,b,c,d,e);
-        }
-
-      private:
-        const Ptr func;
-      };
-
-      class Search
-      {
-      public:
-        Search(const Policy *p)
-          : func(p->_func)
-        {}
-
-        int
-        operator()(cstrvec& b,cstring& c,csize_t d,strvec& e)
-        {
-          return func(Category::Enum::search,b,c,d,e);
-        }
-
-      private:
-        const Ptr func;
-      };
-
-      static int all(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int einval(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int enosys(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int enotsup(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int epmfs(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int erofs(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int exdev(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int ff(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int ffwp(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int fwfs(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int invalid(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int lfs(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int mfs(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int newest(CType,cstrvec&,cstring&,csize_t,strvec&);
-      static int rand(CType,cstrvec&,cstring&,csize_t,strvec&);
+      static int invalid(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int all(CType,cstrvec&,const char*,csize_t,cstrptrvec&);
+      static int eplfs(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int eplus(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int epmfs(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int erofs(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int ff(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int lfs(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int lus(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int mfs(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int newest(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
+      static int rand(CType,cstrvec&,const char *,csize_t,cstrptrvec&);
    };

  private:
    Enum::Type  _enum;
    std::string _str;
    Func::Ptr   _func;
+    bool        _path_preserving;

  public:
    Policy()
      : _enum(invalid),
        _str(invalid),
-        _func(invalid)
+        _func(invalid),
+        _path_preserving(false)
    {
    }

    Policy(const Enum::Type   enum_,
           const std::string &str_,
-           const Func::Ptr    func_)
+           const Func::Ptr    func_,
+           const bool         path_preserving_)
      : _enum(enum_),
        _str(str_),
-        _func(func_)
+        _func(func_),
+        _path_preserving(path_preserving_)
    {
    }

+    bool
+    path_preserving() const
+    {
+      return _path_preserving;
+    }
+
  public:
    operator const Enum::Type() const { return _enum; }
    operator const std::string&() const { return _str; }
@@ -195,16 +170,13 @@ namespace mergerfs

    static const Policy &invalid;
    static const Policy &all;
-    static const Policy &einval;
-    static const Policy &enosys;
-    static const Policy &enotsup;
+    static const Policy &eplfs;
+    static const Policy &eplus;
    static const Policy &epmfs;
    static const Policy &erofs;
-    static const Policy &exdev;
    static const Policy &ff;
-    static const Policy &ffwp;
-    static const Policy &fwfs;
    static const Policy &lfs;
+    static const Policy &lus;
    static const Policy &mfs;
    static const Policy &newest;
    static const Policy &rand;
@@ -1,35 +1,25 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <errno.h>

 #include <string>
 #include <vector>

+#include "fs.hpp"
 #include "fs_path.hpp"
 #include "policy.hpp"

@@ -39,42 +29,57 @@ using std::size_t;

 static
 int
-_all(const vector<string> &basepaths,
-     const string         &fusepath,
-     vector<string>       &paths)
+_all_create(const vector<string>  &basepaths,
+            const size_t           minfreespace,
+            vector<const string*> &paths)
 {
-  int rv;
-  struct stat st;
-  string fullpath;
-
  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
    {
-      const string &basepath = basepaths[i];
+      bool readonly;
+      size_t spaceavail;
+      size_t _spaceused;
+      const string *basepath = &basepaths[i];

-      fs::path::make(basepath,fusepath,fullpath);
+      if(!fs::info(*basepath,readonly,spaceavail,_spaceused))
+        continue;
+      if(readonly)
+        continue;
+      if(spaceavail < minfreespace)
+        continue;

-      rv = ::lstat(fullpath.c_str(),&st);
-      if(rv == 0)
-        paths.push_back(basepath);
+      paths.push_back(basepath);
    }

  if(paths.empty())
-    return (errno=ENOENT,-1);
+    return POLICY_FAIL_ENOENT;

-  return 0;
+  return POLICY_SUCCESS;
 }

 static
 int
-_all_create(const vector<string> &basepaths,
-            vector<string>       &paths)
+_all_other(const vector<string>  &basepaths,
+           const char            *fusepath,
+           vector<const string*> &paths)
 {
-  if(basepaths.empty())
-    return (errno=ENOENT,-1);
+  string fullpath;

-  paths = basepaths;
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
+    {
+      const string *basepath = &basepaths[i];

-  return 0;
+      fs::path::make(basepath,fusepath,fullpath);
+
+      if(!fs::exists(fullpath))
+        continue;
+
+      paths.push_back(basepath);
+    }
+
+  if(paths.empty())
+    return POLICY_FAIL_ENOENT;
+
+  return POLICY_SUCCESS;
 }

 namespace mergerfs
@@ -82,13 +87,13 @@ namespace mergerfs
  int
  Policy::Func::all(const Category::Enum::Type  type,
                    const vector<string>       &basepaths,
-                    const string               &fusepath,
+                    const char                 *fusepath,
                    const size_t                minfreespace,
-                    vector<string>             &paths)
+                    vector<const string*>      &paths)
  {
    if(type == Category::Enum::create)
-      return _all_create(basepaths,paths);
+      return _all_create(basepaths,minfreespace,paths);

-    return _all(basepaths,fusepath,paths);
+    return _all_other(basepaths,fusepath,paths);
  }
 }
@@ -1,46 +0,0 @@
-/*
-   The MIT License (MIT)
-
-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-*/
-
-#include <errno.h>
-
-#include <string>
-#include <vector>
-
-#include "policy.hpp"
-
-using std::string;
-using std::vector;
-
-namespace mergerfs
-{
-  int
-  Policy::Func::einval(const Category::Enum::Type  type,
-                       const vector<string>       &basepaths,
-                       const string               &fusepath,
-                       const size_t                minfreespace,
-                       vector<string>             &paths)
-  {
-    return (errno=EINVAL,-1);
-  }
-}
@@ -1,46 +0,0 @@
-/*
-   The MIT License (MIT)
-
-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-*/
-
-#include <errno.h>
-
-#include <string>
-#include <vector>
-
-#include "policy.hpp"
-
-using std::string;
-using std::vector;
-
-namespace mergerfs
-{
-  int
-  Policy::Func::enosys(const Category::Enum::Type  type,
-                       const vector<string>       &basepaths,
-                       const string               &fusepath,
-                       const size_t                minfreespace,
-                       vector<string>             &paths)
-  {
-    return (errno=ENOSYS,-1);
-  }
-}
@@ -1,46 +0,0 @@
-/*
-   The MIT License (MIT)
-
-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-*/
-
-#include <errno.h>
-
-#include <string>
-#include <vector>
-
-#include "policy.hpp"
-
-using std::string;
-using std::vector;
-
-namespace mergerfs
-{
-  int
-  Policy::Func::enotsup(const Category::Enum::Type  type,
-                        const vector<string>       &basepaths,
-                        const string               &fusepath,
-                        const size_t                minfreespace,
-                        vector<string>             &paths)
-  {
-    return (errno=ENOTSUP,-1);
-  }
-}
@@ -0,0 +1,146 @@
+/*
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include <errno.h>
+
+#include <limits>
+#include <string>
+#include <vector>
+
+#include "fs.hpp"
+#include "fs_path.hpp"
+#include "policy.hpp"
+
+using std::string;
+using std::vector;
+using std::size_t;
+using mergerfs::Category;
+
+static
+int
+_eplfs_create(const vector<string>  &basepaths,
+              const char            *fusepath,
+              const size_t           minfreespace,
+              vector<const string*> &paths)
+{
+  string fullpath;
+  size_t eplfs;
+  const string *eplfsbasepath;
+
+  eplfs = std::numeric_limits<size_t>::max();
+  eplfsbasepath = NULL;
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
+    {
+      bool readonly;
+      size_t spaceavail;
+      size_t _spaceused;
+      const string *basepath = &basepaths[i];
+
+      fs::path::make(basepath,fusepath,fullpath);
+
+      if(!fs::exists(fullpath))
+        continue;
+      if(!fs::info(*basepath,readonly,spaceavail,_spaceused))
+        continue;
+      if(readonly)
+        continue;
+      if(spaceavail < minfreespace)
+        continue;
+      if(spaceavail > eplfs)
+        continue;
+
+      eplfs = spaceavail;
+      eplfsbasepath = basepath;
+    }
+
+  if(eplfsbasepath == NULL)
+    return POLICY_FAIL_ENOENT;
+
+  paths.push_back(eplfsbasepath);
+
+  return POLICY_SUCCESS;
+}
+
+static
+int
+_eplfs_other(const vector<string>  &basepaths,
+             const char            *fusepath,
+             vector<const string*> &paths)
+{
+  string fullpath;
+  size_t eplfs;
+  const string *eplfsbasepath;
+
+  eplfs = std::numeric_limits<size_t>::max();
+  eplfsbasepath = NULL;
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
+    {
+      size_t spaceavail;
+      const string *basepath = &basepaths[i];
+
+      fs::path::make(basepath,fusepath,fullpath);
+
+      if(!fs::exists(fullpath))
+        continue;
+      if(!fs::spaceavail(*basepath,spaceavail))
+        continue;
+      if(spaceavail > eplfs)
+        continue;
+
+      eplfs = spaceavail;
+      eplfsbasepath = basepath;
+    }
+
+  if(eplfsbasepath == NULL)
+    return POLICY_FAIL_ENOENT;
+
+  paths.push_back(eplfsbasepath);
+
+  return POLICY_SUCCESS;
+}
+
+static
+int
+_eplfs(const Category::Enum::Type type,
+       const vector<string>       &basepaths,
+       const char                 *fusepath,
+       const size_t                minfreespace,
+       vector<const string*>      &paths)
+{
+  if(type == Category::Enum::create)
+    return _eplfs_create(basepaths,fusepath,minfreespace,paths);
+
+  return _eplfs_other(basepaths,fusepath,paths);
+}
+
+namespace mergerfs
+{
+  int
+  Policy::Func::eplfs(const Category::Enum::Type  type,
+                      const vector<string>       &basepaths,
+                      const char                 *fusepath,
+                      const size_t                minfreespace,
+                      vector<const string*>      &paths)
+  {
+    int rv;
+
+    rv = _eplfs(type,basepaths,fusepath,minfreespace,paths);
+    if(POLICY_FAILED(rv))
+      rv = Policy::Func::lfs(type,basepaths,fusepath,minfreespace,paths);
+
+    return rv;
+  }
+}
@@ -0,0 +1,146 @@
+/*
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include <errno.h>
+
+#include <limits>
+#include <string>
+#include <vector>
+
+#include "fs.hpp"
+#include "fs_path.hpp"
+#include "policy.hpp"
+
+using std::string;
+using std::vector;
+using std::size_t;
+using mergerfs::Category;
+
+static
+int
+_eplus_create(const vector<string>  &basepaths,
+              const char            *fusepath,
+              const size_t           minfreespace,
+              vector<const string*> &paths)
+{
+  string fullpath;
+  size_t eplus;
+  const string *eplusbasepath;
+
+  eplus = std::numeric_limits<size_t>::max();
+  eplusbasepath = NULL;
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
+    {
+      bool readonly;
+      size_t spaceavail;
+      size_t spaceused;
+      const string *basepath = &basepaths[i];
+
+      fs::path::make(basepath,fusepath,fullpath);
+
+      if(!fs::exists(fullpath))
+        continue;
+      if(!fs::info(*basepath,readonly,spaceavail,spaceused))
+        continue;
+      if(readonly)
+        continue;
+      if(spaceavail < minfreespace)
+        continue;
+      if(spaceused >= eplus)
+        continue;
+
+      eplus = spaceused;
+      eplusbasepath = basepath;
+    }
+
+  if(eplusbasepath == NULL)
+    return POLICY_FAIL_ENOENT;
+
+  paths.push_back(eplusbasepath);
+
+  return POLICY_SUCCESS;
+}
+
+static
+int
+_eplus_other(const vector<string>  &basepaths,
+             const char            *fusepath,
+             vector<const string*> &paths)
+{
+  string fullpath;
+  size_t eplus;
+  const string *eplusbasepath;
+
+  eplus = 0;
+  eplusbasepath = NULL;
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
+    {
+      size_t spaceused;
+      const string *basepath = &basepaths[i];
+
+      fs::path::make(basepath,fusepath,fullpath);
+
+      if(!fs::exists(fullpath))
+        continue;
+      if(!fs::spaceused(*basepath,spaceused))
+        continue;
+      if(spaceused >= eplus)
+        continue;
+
+      eplus = spaceused;
+      eplusbasepath = basepath;
+    }
+
+  if(eplusbasepath == NULL)
+    return POLICY_FAIL_ENOENT;
+
+  paths.push_back(eplusbasepath);
+
+  return POLICY_SUCCESS;
+}
+
+static
+int
+_eplus(const Category::Enum::Type  type,
+       const vector<string>       &basepaths,
+       const char                 *fusepath,
+       const size_t                minfreespace,
+       vector<const string*>      &paths)
+{
+  if(type == Category::Enum::create)
+    return _eplus_create(basepaths,fusepath,minfreespace,paths);
+
+  return _eplus_other(basepaths,fusepath,paths);
+}
+
+namespace mergerfs
+{
+  int
+  Policy::Func::eplus(const Category::Enum::Type  type,
+                      const vector<string>       &basepaths,
+                      const char                 *fusepath,
+                      const size_t                minfreespace,
+                      vector<const string*>     &paths)
+  {
+    int rv;
+
+    rv = _eplus(type,basepaths,fusepath,minfreespace,paths);
+    if(POLICY_FAILED(rv))
+      rv = Policy::Func::lus(type,basepaths,fusepath,minfreespace,paths);
+
+    return rv;
+  }
+}
@@ -1,130 +1,129 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <sys/statvfs.h>

+#include <limits>
 #include <string>
 #include <vector>

+#include "fs.hpp"
 #include "fs_path.hpp"
 #include "policy.hpp"

 using std::string;
 using std::vector;
 using std::size_t;
-using mergerfs::Policy;
 using mergerfs::Category;
-typedef struct statvfs statvfs_t;

 static
-inline
-void
-_calc_mfs(const statvfs_t &fsstats,
-          const string    &basepath,
-          const size_t     minfreespace,
-          fsblkcnt_t      &mfs,
-          string          &mfsbasepath)
+int
+_epmfs_create(const vector<string>  &basepaths,
+              const char            *fusepath,
+              const size_t           minfreespace,
+              vector<const string*> &paths)
 {
-  fsblkcnt_t spaceavail;
+  string fullpath;
+  size_t epmfs;
+  const string *epmfsbasepath;

-  spaceavail = (fsstats.f_frsize * fsstats.f_bavail);
-  if((spaceavail > minfreespace) && (spaceavail > mfs))
+  epmfs = std::numeric_limits<size_t>::min();
+  epmfsbasepath = NULL;
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
    {
-      mfs         = spaceavail;
-      mfsbasepath = basepath;
+      bool readonly;
+      size_t spaceavail;
+      size_t _spaceused;
+      const string *basepath = &basepaths[i];
+
+      fs::path::make(basepath,fusepath,fullpath);
+
+      if(!fs::exists(fullpath))
+        continue;
+      if(!fs::info(*basepath,readonly,spaceavail,_spaceused))
+        continue;
+      if(readonly)
+        continue;
+      if(spaceavail < minfreespace)
+        continue;
+      if(spaceavail < epmfs)
+        continue;
+
+      epmfs = spaceavail;
+      epmfsbasepath = basepath;
    }
+
+  if(epmfsbasepath == NULL)
+    return POLICY_FAIL_ENOENT;
+
+  paths.push_back(epmfsbasepath);
+
+  return POLICY_SUCCESS;
 }

 static
 int
-_epmfs_create(const vector<string> &basepaths,
-              const string         &fusepath,
-              const size_t          minfreespace,
-              vector<string>       &paths)
-
+_epmfs_other(const vector<string>  &basepaths,
+             const char            *fusepath,
+             vector<const string*> &paths)
 {
-  int        rv;
-  fsblkcnt_t epmfs;
-  string     epmfsbasepath;
-  string     fullpath;
-  statvfs_t  fsstats;
+  string fullpath;
+  size_t epmfs;
+  const string *epmfsbasepath;

  epmfs = 0;
+  epmfsbasepath = NULL;
  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
    {
-      const string &basepath = basepaths[i];
+      size_t spaceavail;
+      const string *basepath = &basepaths[i];

      fs::path::make(basepath,fusepath,fullpath);

-      rv = ::statvfs(fullpath.c_str(),&fsstats);
-      if(rv == 0)
-        _calc_mfs(fsstats,basepath,minfreespace,epmfs,epmfsbasepath);
+      if(!fs::exists(fullpath))
+        continue;
+      if(!fs::spaceavail(*basepath,spaceavail))
+        continue;
+      if(spaceavail < epmfs)
+        continue;
+
+      epmfs = spaceavail;
+      epmfsbasepath = basepath;
    }

-  if(epmfsbasepath.empty())
-    return Policy::Func::mfs(Category::Enum::create,basepaths,fusepath,minfreespace,paths);
+  if(epmfsbasepath == NULL)
+    return POLICY_FAIL_ENOENT;

  paths.push_back(epmfsbasepath);

-  return 0;
+  return POLICY_SUCCESS;
 }

 static
 int
-_epmfs(const vector<string> &basepaths,
-       const string         &fusepath,
-       vector<string>       &paths)
-
+_epmfs(const Category::Enum::Type  type,
+       const vector<string>       &basepaths,
+       const char                 *fusepath,
+       const size_t                minfreespace,
+       vector<const string*>      &paths)
 {
-  int        rv;
-  fsblkcnt_t epmfs;
-  string     epmfsbasepath;
-  string     fullpath;
-  statvfs_t  fsstats;
+  if(type == Category::Enum::create)
+    return _epmfs_create(basepaths,fusepath,minfreespace,paths);

-  epmfs = 0;
-  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
-    {
-      const string &basepath = basepaths[i];
-
-      fs::path::make(basepath,fusepath,fullpath);
-
-      rv = ::statvfs(fullpath.c_str(),&fsstats);
-      if(rv == 0)
-        _calc_mfs(fsstats,basepath,0,epmfs,epmfsbasepath);
-    }
-
-  if(epmfsbasepath.empty())
-    return (errno=ENOENT,-1);
-
-  paths.push_back(epmfsbasepath);
-
-  return 0;
+  return _epmfs_other(basepaths,fusepath,paths);
 }

 namespace mergerfs
@@ -132,13 +131,16 @@ namespace mergerfs
  int
  Policy::Func::epmfs(const Category::Enum::Type  type,
                      const vector<string>       &basepaths,
-                      const string               &fusepath,
+                      const char                 *fusepath,
                      const size_t                minfreespace,
-                      vector<string>             &paths)
+                      vector<const string*>     &paths)
  {
-    if(type == Category::Enum::create)
-      return _epmfs_create(basepaths,fusepath,minfreespace,paths);
+    int rv;

-    return _epmfs(basepaths,fusepath,paths);
+    rv = _epmfs(type,basepaths,fusepath,minfreespace,paths);
+    if(POLICY_FAILED(rv))
+      rv = Policy::Func::mfs(type,basepaths,fusepath,minfreespace,paths);
+
+    return rv;
  }
 }
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <errno.h>
@@ -37,10 +29,10 @@ namespace mergerfs
  int
  Policy::Func::erofs(const Category::Enum::Type  type,
                      const vector<string>       &basepaths,
-                      const string               &fusepath,
+                      const char                 *fusepath,
                      const size_t                minfreespace,
-                      vector<string>             &paths)
+                      vector<const string*>      &paths)
  {
-    return (errno=EROFS,-1);
+    return POLICY_FAIL_ERRNO(EROFS);
  }
 }
@@ -1,46 +0,0 @@
-/*
-   The MIT License (MIT)
-
-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-*/
-
-#include <errno.h>
-
-#include <string>
-#include <vector>
-
-#include "policy.hpp"
-
-using std::string;
-using std::vector;
-
-namespace mergerfs
-{
-  int
-  Policy::Func::exdev(const Category::Enum::Type  type,
-                      const vector<string>       &basepaths,
-                      const string               &fusepath,
-                      const size_t                minfreespace,
-                      vector<string>             &paths)
-  {
-    return (errno=EXDEV,-1);
-  }
-}
@@ -1,35 +1,25 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <errno.h>

 #include <string>
 #include <vector>

+#include "fs.hpp"
 #include "fs_path.hpp"
 #include "policy.hpp"

@@ -39,43 +29,65 @@ using std::size_t;

 static
 int
-_ff(const vector<string> &basepaths,
-    const string         &fusepath,
-    vector<string>       &paths)
+_ff_create(const vector<string>  &basepaths,
+           const size_t           minfreespace,
+           vector<const string*> &paths)
 {
+  const string *fallback;
+
+  fallback = NULL;
  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
    {
-      int           rv;
-      struct stat   st;
-      string        fullpath;
-      const string &basepath = basepaths[i];
+      bool readonly;
+      size_t spaceavail;
+      size_t _spaceused;
+      const string *basepath = &basepaths[i];

-      fullpath = fs::path::make(basepath,fusepath);
-
-      rv = ::lstat(fullpath.c_str(),&st);
-      if(rv == -1)
+      if(!fs::info(*basepath,readonly,spaceavail,_spaceused))
+        continue;
+      if(readonly)
+        continue;
+      if(fallback == NULL)
+        fallback = basepath;
+      if(spaceavail < minfreespace)
        continue;

      paths.push_back(basepath);

-      return 0;
+      return POLICY_SUCCESS;
    }

-  return (errno=ENOENT,-1);
+  if(fallback == NULL)
+    return POLICY_FAIL_ENOENT;
+
+  paths.push_back(fallback);
+
+  return POLICY_SUCCESS;
 }

 static
 int
-_ff_create(const vector<string> &basepaths,
-           const string         &fusepath,
-           vector<string>       &paths)
+_ff_other(const vector<string>  &basepaths,
+          const char            *fusepath,
+          vector<const string*> &paths)
 {
-  if(basepaths.empty())
-    return (errno=ENOENT,-1);
+  string fullpath;

-  paths.push_back(basepaths[0]);
+  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
+    {
+      const string *basepath = &basepaths[i];

-  return 0;
+      fs::path::make(basepath,fusepath,fullpath);
+
+      if(!fs::exists(fullpath))
+        continue;
+
+      paths.push_back(basepath);
+
+      return POLICY_SUCCESS;
+    }
+
+  return POLICY_FAIL_ENOENT;
 }

 namespace mergerfs
@@ -83,13 +95,13 @@ namespace mergerfs
  int
  Policy::Func::ff(const Category::Enum::Type  type,
                   const vector<string>       &basepaths,
-                   const string               &fusepath,
+                   const char                 *fusepath,
                   const size_t                minfreespace,
-                   vector<string>             &paths)
+                   vector<const string*>      &paths)
  {
    if(type == Category::Enum::create)
-      return _ff_create(basepaths,fusepath,paths);
+      return _ff_create(basepaths,minfreespace,paths);

-    return _ff(basepaths,fusepath,paths);
+    return _ff_other(basepaths,fusepath,paths);
  }
 }
@@ -1,88 +0,0 @@
-/*
-   The MIT License (MIT)
-
-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-*/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <string>
-#include <vector>
-
-#include "fs_path.hpp"
-#include "policy.hpp"
-
-using std::string;
-using std::vector;
-using std::size_t;
-
-static
-int
-_ffwp(const vector<string> &basepaths,
-      const string         &fusepath,
-      vector<string>       &paths)
-{
-  string fallback;
-
-  for(size_t i = 0, ei = basepaths.size(); i != ei; i++)
-    {
-      int           rv;
-      struct stat   st;
-      string        fullpath;
-      const string &basepath = basepaths[i];
-
-      fs::path::make(basepath,fusepath,fullpath);
-
-      rv = ::lstat(fullpath.c_str(),&st);
-      if(rv == 0)
-        {
-          paths.push_back(basepath);
-          return 0;
-        }
-      else if(errno == EACCES)
-        {
-          fallback = basepath;
-        }
-    }
-
-  if(fallback.empty())
-    return (errno=ENOENT,-1);
-
-  paths.push_back(fallback);
-
-  return 0;
-}
-
-namespace mergerfs
-{
-  int
-  Policy::Func::ffwp(const Category::Enum::Type  type,
-                     const vector<string>       &basepaths,
-                     const string               &fusepath,
-                     const size_t                minfreespace,
-                     vector<string>             &paths)
-  {
-    return _ffwp(basepaths,fusepath,paths);
-  }
-}
@@ -1,121 +0,0 @@
-/*
-   The MIT License (MIT)
-
-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-*/
-
-#include <sys/statvfs.h>
-#include <errno.h>
-
-#include <string>
-#include <vector>
-
-#include "fs_path.hpp"
-#include "policy.hpp"
-
-using std::string;
-using std::vector;
-using std::size_t;
-using mergerfs::Policy;
-using mergerfs::Category;
-
-static
-int
-_fwfs_create(const Category::Enum::Type  type,
-             const vector<string>       &basepaths,
-             const string               &fusepath,
-             const size_t                minfreespace,
-             vector<string>             &paths)
-{
-  for(size_t i = 0, size = basepaths.size(); i != size; i++)
-    {
-      int rv;
-      struct statvfs fsstats;
-      const string   &basepath = basepaths[i];
-
-      rv = ::statvfs(basepath.c_str(),&fsstats);
-      if(rv == 0)
-        {
-          fsblkcnt_t spaceavail;
-
-          spaceavail = (fsstats.f_frsize * fsstats.f_bavail);
-          if(spaceavail < minfreespace)
-            continue;
-
-          paths.push_back(basepath);
-
-          return 0;
-        }
-    }
-
-  return Policy::Func::mfs(type,basepaths,fusepath,minfreespace,paths);
-}
-
-static
-int
-_fwfs(const Category::Enum::Type  type,
-      const vector<string>       &basepaths,
-      const string               &fusepath,
-      const size_t                minfreespace,
-      vector<string>             &paths)
-{
-  for(size_t i = 0, size = basepaths.size(); i != size; i++)
-    {
-      int rv;
-      string fullpath;
-      struct statvfs fsstats;
-      const string &basepath = basepaths[i];
-
-      fs::path::make(basepath,fusepath,fullpath);
-
-      rv = ::statvfs(fullpath.c_str(),&fsstats);
-      if(rv == 0)
-        {
-          fsblkcnt_t spaceavail;
-
-          spaceavail = (fsstats.f_frsize * fsstats.f_bavail);
-          if(spaceavail < minfreespace)
-            continue;
-
-          paths.push_back(basepath);
-
-          return 0;
-        }
-    }
-
-  return Policy::Func::mfs(type,basepaths,fusepath,minfreespace,paths);
-}
-
-namespace mergerfs
-{
-  int
-  Policy::Func::fwfs(const Category::Enum::Type  type,
-                     const vector<string>       &basepaths,
-                     const string               &fusepath,
-                     const size_t                minfreespace,
-                     vector<string>             &paths)
-  {
-    if(type == Category::Enum::create)
-      return _fwfs_create(type,basepaths,fusepath,minfreespace,paths);
-
-    return _fwfs(type,basepaths,fusepath,minfreespace,paths);
-  }
-}
@@ -1,25 +1,17 @@
 /*
-   The MIT License (MIT)
+  Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>

-   Copyright (c) 2014 Antonio SJ Musumeci <trapexit@spawn.link>
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.

-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

 #include <errno.h>
@@ -38,10 +30,10 @@ namespace mergerfs
  int
  Policy::Func::invalid(const Category::Enum::Type  type,
                        const vector<string>       &basepaths,
-                        const string               &fusepath,
+                        const char                 *fusepath,
                        const size_t                minfreespace,
-                        vector<string>             &rv)
+                        vector<const string*>      &paths)
  {
-    return (errno=EINVAL,-1);
+    return POLICY_FAIL_ERRNO(EINVAL);
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Antonio SJ Musumeci	81e9544f7d	Merge pull request #281 from trapexit/update-man update man page	2016-05-19 17:30:07 -04:00
Antonio SJ Musumeci	3cb2045ebb	update man page	2016-05-19 17:28:37 -04:00
Antonio SJ Musumeci	652440fd8c	Merge pull request #280 from trapexit/mmapbug update info on mmap bug and when it was fixed	2016-05-17 16:09:38 -04:00
Antonio SJ Musumeci	6dc6fde641	update info on mmap bug and when it was fixed	2016-05-17 16:09:22 -04:00
Antonio SJ Musumeci	66fdcc4ef7	Merge pull request #279 from trapexit/fallocate rework fallocate logic	2016-05-11 13:23:33 -04:00
Antonio SJ Musumeci	cb35a374ac	rework fallocate logic	2016-05-11 13:19:44 -04:00
Antonio SJ Musumeci	68210d9252	Merge pull request #278 from trapexit/ioctl-dir fix ioctl on directories	2016-05-11 13:12:50 -04:00
Antonio SJ Musumeci	23b8e4582e	fix ioctl on directories	2016-05-11 11:22:00 -04:00
Antonio SJ Musumeci	13511ea72a	Merge pull request #275 from trapexit/updateman update man page	2016-05-07 15:19:34 -04:00
Antonio SJ Musumeci	3a50344cb9	update man page	2016-05-07 15:18:48 -04:00
Antonio SJ Musumeci	9f27ad448a	Merge pull request #274 from trapexit/lus add least used space and existing path, least used space policies	2016-05-07 15:17:58 -04:00
Antonio SJ Musumeci	be6341e6f0	create eplus (existing path, least used space) policy. closes #273	2016-05-07 15:15:51 -04:00
Antonio SJ Musumeci	f7d3e8bf47	create lus (least used space) policy. closes #273	2016-05-07 14:59:42 -04:00
Antonio SJ Musumeci	e541cdb755	Merge pull request #272 from trapexit/faq-direct-reads faq update on direct writes	2016-05-03 11:44:24 -04:00
Antonio SJ Musumeci	74ed1b09ee	faq update on direct writes	2016-05-03 11:44:04 -04:00
Antonio SJ Musumeci	9987111fa4	Merge pull request #271 from trapexit/fstabdocs clean up information regarding fstab	2016-04-27 07:13:28 -04:00
Antonio SJ Musumeci	d0414d7c78	clean up information regarding fstab	2016-04-27 07:13:05 -04:00
Antonio SJ Musumeci	8f6a7ba79a	Merge pull request #270 from trapexit/fsname add fsname to readme	2016-04-25 16:58:27 -04:00
Antonio SJ Musumeci	ef8d8f306e	add fsname to readme	2016-04-25 16:58:18 -04:00
Antonio SJ Musumeci	1de01684e0	Merge pull request #269 from trapexit/createcatdesc further tweak language regarding policies wrt create category	2016-04-13 13:06:49 -04:00
Antonio SJ Musumeci	cd15b7a66a	further tweak language regarding policies wrt create category	2016-04-13 13:06:35 -04:00
Antonio SJ Musumeci	6b88258d81	Merge pull request #268 from trapexit/policy-desc make policy descriptions more explicit	2016-04-13 12:46:26 -04:00
Antonio SJ Musumeci	8643d35ebf	make policy descriptions more explicit	2016-04-13 12:45:49 -04:00
Antonio SJ Musumeci	b7d7ace9bf	Merge pull request #266 from trapexit/tweakreadme tweak doc language	2016-04-06 14:57:21 -04:00
Antonio SJ Musumeci	1cfe1c3715	tweak doc language	2016-04-06 14:57:02 -04:00
Antonio SJ Musumeci	63b02b327b	Merge pull request #265 from trapexit/mmap-bug add details of mmap cache bug	2016-04-03 16:57:06 -04:00
Antonio SJ Musumeci	dbb13ef7ad	add details of mmap cache bug	2016-04-03 16:56:47 -04:00
Antonio SJ Musumeci	6aec6c939a	Merge pull request #263 from trapexit/dualmount add dual mount suggestion to mmap problem	2016-03-15 16:45:06 -04:00
Antonio SJ Musumeci	90ca14afff	add dual mount suggestion to mmap problem	2016-03-15 16:44:49 -04:00
Antonio SJ Musumeci	c7328293a0	Merge pull request #262 from trapexit/mmap-direct_io add details regarding rtorrent, mmap, and direct_io	2016-03-15 08:25:06 -04:00
Antonio SJ Musumeci	cfaf812c62	add details regarding rtorrent, mmap, and direct_io	2016-03-15 08:24:35 -04:00
Antonio SJ Musumeci	47fb6e29c6	Merge pull request #259 from trapexit/dedup-tool update readme to include mergerfs.dedup	2016-03-11 18:03:33 -05:00
Antonio SJ Musumeci	0c6c69e02e	update readme to include mergerfs.dedup	2016-03-11 18:03:22 -05:00
Antonio SJ Musumeci	4b6cfdc68a	Merge pull request #258 from trapexit/tarball-url change tar.gz build url	2016-03-11 16:55:26 -05:00
Antonio SJ Musumeci	309cfee52b	change tar.gz build url	2016-03-11 16:55:10 -05:00
Antonio SJ Musumeci	9b3c085cf3	Merge pull request #257 from trapexit/man tweak man page creation	2016-03-10 18:43:12 -05:00
Antonio SJ Musumeci	382ca876ca	tweak man page creation	2016-03-10 18:42:32 -05:00
Antonio SJ Musumeci	93acfb015c	Merge pull request #256 from trapexit/xattr properly check errors of xattr. closes #255	2016-03-10 18:38:05 -05:00
Antonio SJ Musumeci	070ed08caa	properly check errors of xattr. closes #255	2016-03-10 18:37:09 -05:00
Antonio SJ Musumeci	5d44161e77	Merge pull request #251 from trapexit/man update precompiled man page	2016-03-06 02:23:47 -05:00
Antonio SJ Musumeci	6492fda483	update precompiled man page	2016-03-06 02:22:58 -05:00
Antonio SJ Musumeci	447fd8b2fb	Merge pull request #250 from trapexit/rename fix rename failing on non-path preserving policies	2016-03-06 02:22:23 -05:00
Antonio SJ Musumeci	2061211894	fix rename failing on non-path preserving policies	2016-03-06 02:21:23 -05:00
Antonio SJ Musumeci	5030d5a5b4	Merge pull request #249 from trapexit/clarify-rename clarify that rename uses the create policy to make decisions	2016-03-04 20:33:10 -05:00
Antonio SJ Musumeci	4928944167	clarify that rename uses the create policy to make decisions	2016-03-04 20:32:52 -05:00
Antonio SJ Musumeci	6957cf39d1	Merge pull request #247 from trapexit/epmfs re-add minfreespace check to epmfs policy	2016-03-04 13:56:15 -05:00
Antonio SJ Musumeci	12cf57dc5a	re-add minfreespace check to epmfs policy	2016-03-04 13:52:31 -05:00
Antonio SJ Musumeci	26c2ebc843	Merge pull request #245 from trapexit/readme change tooling names and add guide link	2016-03-03 10:47:45 -05:00
Antonio SJ Musumeci	59b08a5bc3	change tooling names and add guide link	2016-03-03 10:46:53 -05:00
Antonio SJ Musumeci	8ac3518725	Merge pull request #244 from trapexit/gitdebcl fix building of platform specific deb packages	2016-03-01 00:19:59 -05:00
Antonio SJ Musumeci	f4a4cc5812	fix building of platform specific deb packages	2016-03-01 00:19:05 -05:00
Antonio SJ Musumeci	b93783ede0	Merge pull request #243 from trapexit/git2dbcl fix printing of versions with no changes	2016-02-29 23:56:29 -05:00
Antonio SJ Musumeci	ef4c583b3f	fix printing of versions with no changes	2016-02-29 23:55:36 -05:00
Antonio SJ Musumeci	6d049c16d1	Merge pull request #242 from trapexit/statvfs clearly separate usage of statvfs from stat for file existance	2016-02-29 23:11:00 -05:00
Antonio SJ Musumeci	4ecf3c5797	clearly separate usage of statvfs from stat for file existance Used statvfs to also check for existance vs lstat. On dead symlinks this resulted in ENOENT making certain functions fail. closes #239	2016-02-29 23:04:59 -05:00
Antonio SJ Musumeci	4a63c000ca	Merge pull request #241 from trapexit/policy-ff add minfreespace checks to policy ff's create and remove fwfs	2016-02-29 18:15:12 -05:00
Antonio SJ Musumeci	779143f4b6	add minfreespace checks to policy ff's create and remove fwfs fwfs is now covered by ff with the minfreespace and readonly checks	2016-02-29 18:06:59 -05:00
Antonio SJ Musumeci	ccd3b5d2d0	Merge pull request #240 from trapexit/readme update readme with minfreespace and readonly details	2016-02-29 15:15:10 -05:00
Antonio SJ Musumeci	4d7148cdd1	update readme with minfreespace and readonly details	2016-02-29 15:14:31 -05:00
Antonio SJ Musumeci	98a051b161	Merge pull request #238 from trapexit/policy-all add readonly and minfreespace filters to all policy for creates. clos…	2016-02-29 10:55:55 -05:00
Antonio SJ Musumeci	14886a27f4	add readonly and minfreespace filters to all policy for creates. closes #236	2016-02-29 10:15:53 -05:00
Antonio SJ Musumeci	81b9918f6b	Merge pull request #237 from trapexit/renamefix	2016-02-26 17:18:39 -05:00
Antonio SJ Musumeci	9819cf6133	fix clonepath being called on wrong source	2016-02-26 17:16:09 -05:00
Antonio SJ Musumeci	c5e584fa5a	Merge pull request #235 from trapexit/changeloger fix creation of changelog	2016-02-25 17:53:24 -05:00
Antonio SJ Musumeci	c56b488c8d	fix creation of changelog	2016-02-25 17:52:47 -05:00
Antonio SJ Musumeci	cd50a0b0c8	Merge pull request #234 from trapexit/renametweaks normalize error handling in rename policy	2016-02-24 17:11:58 -05:00
Antonio SJ Musumeci	e593927095	normalize error handling in rename policy	2016-02-24 17:10:56 -05:00
Antonio SJ Musumeci	12251cf7c2	Merge pull request #233 from trapexit/ffopt ff policy tweaks	2016-02-24 13:02:24 -05:00
Antonio SJ Musumeci	7c85cd906a	ff policy tweaks	2016-02-24 12:40:02 -05:00
Antonio SJ Musumeci	32c4b1ad1c	Merge pull request #232 from trapexit/version override standard libfuse version flag	2016-02-24 08:39:56 -05:00
Antonio SJ Musumeci	5cf3bb7c98	override standard libfuse version flag	2016-02-24 06:36:33 -05:00
Antonio SJ Musumeci	3f8a6525b3	Merge pull request #231 from trapexit/fstweaks minor tweaks to filesystem utility functions	2016-02-23 12:35:42 -05:00
Antonio SJ Musumeci	25a039942c	minor tweaks to filesystem utility functions	2016-02-23 12:28:20 -05:00
Antonio SJ Musumeci	400537d711	Merge pull request #230 from trapexit/findonfs use stat/2 rather than statvfs/2 to find file drive	2016-02-23 12:07:31 -05:00
Antonio SJ Musumeci	792c9b9808	use stat/2 rather than statvfs/2 to find file drive	2016-02-23 12:06:16 -05:00
Antonio SJ Musumeci	476a8a50ea	Merge pull request #228 from trapexit/readme update / tweak readme	2016-02-21 18:31:02 -05:00
Antonio SJ Musumeci	a698a8a545	update / tweak readme	2016-02-21 18:30:25 -05:00
Antonio SJ Musumeci	5b06bb24fb	Merge pull request #227 from trapexit/policy-cleanup remove unnecessary policies	2016-02-21 18:25:11 -05:00
Antonio SJ Musumeci	d4ec341c4f	remove unnecessary policies	2016-02-21 18:24:15 -05:00
Antonio SJ Musumeci	1bbe3a8879	Merge pull request #226 from trapexit/readonly ignore drives mounted as readonly from create policies. closes #224	2016-02-21 14:35:53 -05:00
Antonio SJ Musumeci	5813d1e477	ignore drives mounted as readonly from create policies. closes #224	2016-02-21 14:34:40 -05:00
Antonio SJ Musumeci	81e77216fc	Merge pull request #225 from trapexit/eplfs-readme add eplfs info to readme	2016-02-18 13:32:44 -05:00
Antonio SJ Musumeci	a4e60d7471	add eplfs info to readme	2016-02-18 13:32:30 -05:00
Antonio SJ Musumeci	8edb7c1e1c	Merge pull request #223 from trapexit/statvfs use stat.st_dev to uniquely identify mounts for statfs. closes #213	2016-02-15 22:57:35 -05:00
Antonio SJ Musumeci	f3e75a0544	use stat.st_dev to uniquely identify mounts for statfs. closes #213	2016-02-15 22:55:47 -05:00
Antonio SJ Musumeci	eed2bbf913	Merge pull request #222 from trapexit/policy simplify policies	2016-02-15 02:14:48 -05:00
Antonio SJ Musumeci	b3248a8f78	simplify policies	2016-02-15 02:06:58 -05:00
Antonio SJ Musumeci	fc100006f9	Merge pull request #220 from trapexit/eplfs add existing path, least free space policy. closes #216	2016-02-12 10:08:15 -05:00
Antonio SJ Musumeci	7bf1ca45e4	add existing path, least free space policy. closes #216	2016-02-12 10:06:41 -05:00
Antonio SJ Musumeci	c568a6d356	Merge pull request #219 from trapexit/pathmake use references to srcmounts rather than copies	2016-02-11 21:14:45 -05:00
Antonio SJ Musumeci	6086620e23	use references to srcmounts rather than copies	2016-02-11 21:09:31 -05:00
Antonio SJ Musumeci	f7c37d2974	Merge pull request #218 from trapexit/why-mergerfs add some "why mergerfs instead of X" sections to the FAQ	2016-02-11 15:51:55 -05:00
Antonio SJ Musumeci	3a51ceb327	add some "why mergerfs instead of X" sections to the FAQ	2016-02-11 15:51:22 -05:00
Antonio SJ Musumeci	f510e539ab	Merge pull request #215 from trapexit/trashdirs add section to readme about trash directories	2016-02-11 15:08:28 -05:00
Antonio SJ Musumeci	681f3d7492	add section to readme about trash directories	2016-02-11 15:07:55 -05:00
Antonio SJ Musumeci	a7c1b88bfe	Merge pull request #212 from trapexit/libfuse-crashes add information on fixing libfuse crashes	2016-02-01 09:47:14 -05:00
Antonio SJ Musumeci	0bac344c8b	add information on fixing libfuse crashes	2016-02-01 09:45:40 -05:00
Antonio SJ Musumeci	40e41e472d	Merge pull request #211 from trapexit/rpmspec remove sbin from rpm spec file	2016-01-25 09:43:07 -05:00
Antonio SJ Musumeci	840f9b8593	remove sbin from rpm spec file	2016-01-25 09:42:27 -05:00
Antonio SJ Musumeci	1160868243	Merge pull request #210 from trapexit/statvfs fix statvfs drive dedup. closes #209	2016-01-22 10:16:01 -05:00
Antonio SJ Musumeci	f779f82ed6	fix statvfs drive dedup. closes #209	2016-01-22 10:15:24 -05:00
Antonio SJ Musumeci	a629e60f5c	Merge pull request #208 from trapexit/remove-clone remove clone test tool	2016-01-21 14:55:15 -05:00
Antonio SJ Musumeci	3e20adb109	remove clone test tool	2016-01-21 14:48:12 -05:00
Antonio SJ Musumeci	1931e263be	Merge pull request #207 from trapexit/update-man update the precompiled man page	2016-01-21 12:49:44 -05:00
Antonio SJ Musumeci	e285bde962	update the precompiled man page	2016-01-21 12:49:04 -05:00
Antonio SJ Musumeci	d058a366ee	Merge pull request #206 from trapexit/readme-tweaks general tweaks to readme	2016-01-21 12:47:50 -05:00
Antonio SJ Musumeci	853769bd7c	general tweaks to readme	2016-01-21 12:47:13 -05:00
Antonio SJ Musumeci	a3e693c30e	Merge pull request #205 from trapexit/symlink make symlink function like mknod/mkdir. closes #204	2016-01-20 17:56:03 -05:00
Antonio SJ Musumeci	ea325755a7	make symlink function like mknod/mkdir. closes #204	2016-01-20 17:55:20 -05:00
Antonio SJ Musumeci	091cc230d8	Merge pull request #203 from trapexit/mknod-fix fix indexing of mknod targets. closes #202	2016-01-20 17:27:19 -05:00
Antonio SJ Musumeci	1d1694bbb5	fix indexing of mknod targets. closes #202	2016-01-20 17:24:50 -05:00
Antonio SJ Musumeci	8287f7f119	Merge pull request #201 from trapexit/remove-warning remove incorrect warning about race condition with mkdir/mknod	2016-01-20 17:08:04 -05:00
Antonio SJ Musumeci	93397ea170	remove incorrect warning about race condition with mkdir/mknod	2016-01-20 17:07:33 -05:00
Antonio SJ Musumeci	da6d9b8eab	Merge pull request #200 from trapexit/statfs dedup based on full statvfs struct rather than fsid. closes #183	2016-01-20 16:45:58 -05:00
Antonio SJ Musumeci	25265f4e85	dedup based on full statvfs struct rather than fsid. closes #183	2016-01-20 16:44:05 -05:00
Antonio SJ Musumeci	d4caecacbd	Merge pull request #199 from trapexit/remove-tools remove tooling from repo. closes #198	2016-01-19 16:32:46 -05:00
Antonio SJ Musumeci	de776b7cf0	remove tooling from repo. closes #198	2016-01-19 16:29:51 -05:00
Antonio SJ Musumeci	02c1ce5181	Merge pull request #197 from trapexit/link have link act similar to rename	2016-01-19 16:14:06 -05:00
Antonio SJ Musumeci	62f8fc524e	have link act similar to rename closes #193	2016-01-19 16:08:02 -05:00
Antonio SJ Musumeci	2fe465a29c	Merge pull request #196 from trapexit/license move from MIT to ISC license. closes #194	2016-01-14 16:57:43 -05:00
Antonio SJ Musumeci	242af777be	move from MIT to ISC license. closes #194	2016-01-14 16:56:38 -05:00
Antonio SJ Musumeci	fe7d841500	Merge pull request #195 from trapexit/rv all action functions return success should at least one succeed	2016-01-14 08:26:16 -05:00
Antonio SJ Musumeci	4c77ac4d24	all action functions return success should at least one succeed. closes #189	2016-01-14 07:58:57 -05:00
Antonio SJ Musumeci	f905116c3d	Merge pull request #192 from trapexit/manpage update man page	2016-01-12 23:37:10 -05:00
Antonio SJ Musumeci	b811522474	update man page	2016-01-12 23:36:32 -05:00
Antonio SJ Musumeci	9b80d6905b	Merge pull request #191 from trapexit/srcmounts replace srcpoints with srcmounts	2016-01-12 16:28:27 -05:00
Antonio SJ Musumeci	8a5c5240f2	replace srcpoints with srcmounts	2016-01-12 16:27:47 -05:00
Antonio SJ Musumeci	8257a1f765	Merge pull request #190 from trapexit/rename rework rename algo to minimize likelihood of EXDEV being returned. cl…	2016-01-12 16:24:08 -05:00
Antonio SJ Musumeci	a3e6a0352d	rework rename algo to minimize likelihood of EXDEV being returned. closes #187	2016-01-12 16:23:12 -05:00
Antonio SJ Musumeci	47dc59bff2	Merge pull request #185 from trapexit/policy_template change to using template for policy class	2015-12-29 16:23:10 -05:00
Antonio SJ Musumeci	eb6d1a1bc2	change to using template for policy class	2015-12-29 16:14:37 -05:00
Antonio SJ Musumeci	fbc2cd95cd	Merge pull request #180 from trapexit/nonbash Nonbash	2015-12-14 23:51:26 -05:00
Antonio SJ Musumeci	55c4a32614	add artifacts to gitignore	2015-12-14 23:50:35 -05:00
Antonio SJ Musumeci	51ae7d1980	change make to work with non-bash shells	2015-12-14 23:50:02 -05:00
Antonio SJ Musumeci	4adeb6348b	Merge pull request #179 from trapexit/fix-noxattr fix building without xattr	2015-12-14 19:02:05 -05:00
Antonio SJ Musumeci	c731b7035c	fix building without xattr	2015-12-14 18:48:04 -05:00
Antonio SJ Musumeci	0165fb24d4	Merge pull request #177 from trapexit/xattr-pid add mergerfs pid to xattrs	2015-12-07 23:57:24 -05:00
Antonio SJ Musumeci	9e24796429	add mergerfs pid to xattrs	2015-12-07 21:20:12 -05:00
Antonio SJ Musumeci	2d71229fe9	Merge pull request #172 from trapexit/setgroups use SYS_setgroups rather than setgroups on linux	2015-10-29 23:38:45 -04:00
Antonio SJ Musumeci	5e880bddba	use SYS_setgroups rather than setgroups	2015-10-29 23:20:37 -04:00
Antonio SJ Musumeci	af24bdb426	Merge pull request #171 from trapexit/support add support section to readme and manpage	2015-10-29 15:27:56 -04:00
Antonio SJ Musumeci	8a651b0372	add support section to readme and manpage	2015-10-29 15:27:05 -04:00
Antonio SJ Musumeci	762a04242f	Merge pull request #169 from trapexit/scan-check-cleanup fix misc issues flagged by clang scan-build	2015-10-22 18:08:41 -04:00
Antonio SJ Musumeci	8cd747e673	Merge pull request #168 from trapexit/debversion include distro and codename in deb package versions	2015-10-22 18:06:40 -04:00
Antonio SJ Musumeci	93cedabe9c	fix misc issues flagged by clang scan-build	2015-10-22 18:06:11 -04:00
Antonio SJ Musumeci	fd4ce1b5fa	include distro and codename in deb package versions	2015-10-22 18:05:16 -04:00