summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2013-07-23 14:48:37 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2013-07-23 14:48:37 +0000
commit697ec4c8f3b97be3b8fb6d16411df658e1ee688b (patch)
tree2eea1fdefaa6036564eb54c2635c027cc1e8e839 /sys/fs
parent072ee3bb23cbb4d6cbef05dfe99f19932ef23449 (diff)
downloadFreeBSD-src-697ec4c8f3b97be3b8fb6d16411df658e1ee688b.zip
FreeBSD-src-697ec4c8f3b97be3b8fb6d16411df658e1ee688b.tar.gz
tmpfs works perfectly fine with -o union -- there is no reason to exclude it
from the list of options.
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/tmpfs/tmpfs_vfsops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c
index 8cf8693..4d55f51 100644
--- a/sys/fs/tmpfs/tmpfs_vfsops.c
+++ b/sys/fs/tmpfs/tmpfs_vfsops.c
@@ -79,7 +79,7 @@ static int tmpfs_statfs(struct mount *, struct statfs *);
static const char *tmpfs_opts[] = {
"from", "size", "maxfilesize", "inodes", "uid", "gid", "mode", "export",
- NULL
+ "union", NULL
};
static const char *tmpfs_updateopts[] = {
OpenPOWER on IntegriCloud