From owner-svn-src-head@FreeBSD.ORG Tue Jul 23 14:48:38 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 22191FBA; Tue, 23 Jul 2013 14:48:38 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 13AE82269; Tue, 23 Jul 2013 14:48:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6NEmbDJ044824; Tue, 23 Jul 2013 14:48:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6NEmbeo044823; Tue, 23 Jul 2013 14:48:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201307231448.r6NEmbeo044823@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 23 Jul 2013 14:48:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253573 - head/sys/fs/tmpfs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jul 2013 14:48:38 -0000 Author: nwhitehorn Date: Tue Jul 23 14:48:37 2013 New Revision: 253573 URL: http://svnweb.freebsd.org/changeset/base/253573 Log: tmpfs works perfectly fine with -o union -- there is no reason to exclude it from the list of options. Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c ============================================================================== --- head/sys/fs/tmpfs/tmpfs_vfsops.c Tue Jul 23 14:24:22 2013 (r253572) +++ head/sys/fs/tmpfs/tmpfs_vfsops.c Tue Jul 23 14:48:37 2013 (r253573) @@ -79,7 +79,7 @@ static int tmpfs_statfs(struct mount *, static const char *tmpfs_opts[] = { "from", "size", "maxfilesize", "inodes", "uid", "gid", "mode", "export", - NULL + "union", NULL }; static const char *tmpfs_updateopts[] = {