From 697ec4c8f3b97be3b8fb6d16411df658e1ee688b Mon Sep 17 00:00:00 2001
From: nwhitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 23 Jul 2013 14:48:37 +0000
Subject: tmpfs works perfectly fine with -o union -- there is no reason to
 exclude it from the list of options.

---
 sys/fs/tmpfs/tmpfs_vfsops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys/fs')

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[] = {
-- 
cgit v1.1