linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Valerie Aurora <vaurora@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Miklos Szeredi <miklos@szeredi.hu>, Jan Blunck <jblunck@suse.de>,
	Christoph Hellwig <hch@infradead.org>,
	linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	Valerie Aurora <vaurora@redhat.com>
Subject: [PATCH 18/38] union-mount: Introduce MNT_UNION and MS_UNION flags
Date: Fri,  6 Aug 2010 15:35:04 -0700	[thread overview]
Message-ID: <1281134124-17041-19-git-send-email-vaurora@redhat.com> (raw)
In-Reply-To: <1281134124-17041-1-git-send-email-vaurora@redhat.com>

From: Jan Blunck <jblunck@suse.de>

Add per mountpoint flag for Union Mount support. You need additional patches
to util-linux for that to work - see:

git://git.kernel.org/pub/scm/utils/util-linux-ng/val/util-linux-ng.git

Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Valerie Aurora <vaurora@redhat.com>
---
 fs/namespace.c        |    5 ++++-
 include/linux/fs.h    |    1 +
 include/linux/mount.h |    4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index 984c331..f115cb6 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -809,6 +809,7 @@ static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt)
 		{ MNT_NODIRATIME, ",nodiratime" },
 		{ MNT_RELATIME, ",relatime" },
 		{ MNT_STRICTATIME, ",strictatime" },
+		{ MNT_UNION, ",union" },
 		{ 0, NULL }
 	};
 	const struct proc_fs_info *fs_infop;
@@ -2008,10 +2009,12 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
 		mnt_flags &= ~(MNT_RELATIME | MNT_NOATIME);
 	if (flags & MS_RDONLY)
 		mnt_flags |= MNT_READONLY;
+	if (flags & MS_UNION)
+		mnt_flags |= MNT_UNION;
 
 	flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
 		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
-		   MS_STRICTATIME);
+		   MS_STRICTATIME | MS_UNION);
 
 	if (flags & MS_REMOUNT)
 		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 71ee74e..31cfa48 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -192,6 +192,7 @@ struct inodes_stat_t {
 #define MS_REMOUNT	32	/* Alter flags of a mounted FS */
 #define MS_MANDLOCK	64	/* Allow mandatory locks on an FS */
 #define MS_DIRSYNC	128	/* Directory modifications are synchronous */
+#define MS_UNION	256	/* Merge namespace with FS mounted below */
 #define MS_NOATIME	1024	/* Do not update access times. */
 #define MS_NODIRATIME	2048	/* Do not update directory access times */
 #define MS_BIND		4096
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 4bd0547..0302703 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -43,9 +43,9 @@ struct mnt_namespace;
  */
 #define MNT_SHARED_MASK	(MNT_UNBINDABLE)
 #define MNT_PROPAGATION_MASK	(MNT_SHARED | MNT_UNBINDABLE)
+#define MNT_UNION	0x4000	/* top layer of a union mount */
 
-
-#define MNT_INTERNAL	0x4000
+#define MNT_INTERNAL	0x8000
 
 struct vfsmount {
 	struct list_head mnt_hash;
-- 
1.6.3.3


  parent reply	other threads:[~2010-08-06 22:36 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-06 22:34 [PATCH 00/38] VFS union mounts - Add MS_FALLTHRU Valerie Aurora
2010-08-06 22:34 ` [PATCH 01/38] VFS: Comment follow_mount() and friends Valerie Aurora
2010-08-06 22:34 ` [PATCH 02/38] VFS: Make lookup_hash() return a struct path Valerie Aurora
2010-08-06 22:34 ` [PATCH 03/38] VFS: Add read-only users count to superblock Valerie Aurora
2010-08-06 22:34 ` [PATCH 04/38] autofs4: Save autofs trigger's vfsmount in super block info Valerie Aurora
2010-08-06 22:34 ` [PATCH 05/38] whiteout/NFSD: Don't return information about whiteouts to userspace Valerie Aurora
     [not found]   ` <1281134124-17041-6-git-send-email-vaurora-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2010-08-06 23:36     ` J. Bruce Fields
2010-08-06 22:34 ` [PATCH 06/38] whiteout: Add vfs_whiteout() and whiteout inode operation Valerie Aurora
2010-08-06 22:34 ` [PATCH 07/38] whiteout: Set opaque flag if new directory was previously a whiteout Valerie Aurora
2010-08-06 22:34 ` [PATCH 08/38] whiteout: Allow removal of a directory with whiteouts Valerie Aurora
2010-08-06 22:34 ` [PATCH 09/38] whiteout: tmpfs whiteout support Valerie Aurora
2010-08-06 22:34 ` [PATCH 10/38] whiteout: Split of ext2_append_link() from ext2_add_link() Valerie Aurora
2010-08-06 22:34 ` [PATCH 11/38] whiteout: ext2 whiteout support Valerie Aurora
2010-08-06 22:34 ` [PATCH 12/38] whiteout: jffs2 " Valerie Aurora
2010-08-06 22:34 ` [PATCH 13/38] fallthru: Basic fallthru definitions Valerie Aurora
2010-08-06 22:35 ` [PATCH 14/38] fallthru: ext2 fallthru support Valerie Aurora
2010-08-07  0:28   ` Andreas Dilger
2010-08-08 16:40     ` Valerie Aurora
2010-08-06 22:35 ` [PATCH 15/38] fallthru: jffs2 " Valerie Aurora
2010-08-06 22:35 ` [PATCH 16/38] fallthru: tmpfs " Valerie Aurora
2010-08-06 22:35 ` [PATCH 17/38] union-mount: Union mounts documentation Valerie Aurora
2010-08-06 22:35 ` Valerie Aurora [this message]
2010-08-06 22:35 ` [PATCH 19/38] union-mount: Introduce union_dir structure and basic operations Valerie Aurora
2010-08-06 22:35 ` [PATCH 20/38] union-mount: Free union dirs on removal from dcache Valerie Aurora
2010-08-06 22:35 ` [PATCH 21/38] union-mount: Support for union mounting file systems Valerie Aurora
2010-08-06 22:35 ` [PATCH 22/38] union-mount: Implement union lookup Valerie Aurora
2010-08-06 22:35 ` [PATCH 23/38] union-mount: Call do_whiteout() on unlink and rmdir in unions Valerie Aurora
2010-08-06 22:35 ` [PATCH 24/38] union-mount: Copy up directory entries on first readdir() Valerie Aurora
2010-08-06 22:35 ` [PATCH 25/38] VFS: Split inode_permission() and create path_permission() Valerie Aurora
2010-08-06 22:35 ` [PATCH 26/38] VFS: Create user_path_nd() to lookup both parent and target Valerie Aurora
2010-08-06 22:35 ` [PATCH 27/38] union-mount: In-kernel file copyup routines Valerie Aurora
2010-08-06 22:35 ` [PATCH 28/38] union-mount: Implement union-aware access()/faccessat() Valerie Aurora
2010-08-06 22:35 ` [PATCH 29/38] union-mount: Implement union-aware link() Valerie Aurora
2010-08-06 22:35 ` [PATCH 30/38] union-mount: Implement union-aware rename() Valerie Aurora
2010-08-06 22:35 ` [PATCH 31/38] union-mount: Implement union-aware writable open() Valerie Aurora
2010-08-06 22:35 ` [PATCH 32/38] union-mount: Implement union-aware chown() Valerie Aurora
2010-08-06 22:35 ` [PATCH 33/38] union-mount: Implement union-aware truncate() Valerie Aurora
2010-08-06 22:35 ` [PATCH 34/38] union-mount: Implement union-aware chmod()/fchmodat() Valerie Aurora
2010-08-06 22:35 ` [PATCH 35/38] union-mount: Implement union-aware lchown() Valerie Aurora
2010-08-06 22:35 ` [PATCH 36/38] union-mount: Implement union-aware utimensat() Valerie Aurora
2010-08-06 22:35 ` [PATCH 37/38] union-mount: Implement union-aware setxattr() Valerie Aurora
2010-08-06 22:35 ` [PATCH 38/38] union-mount: Implement union-aware lsetxattr() Valerie Aurora
  -- strict thread matches above, loose matches on Subject: below --
2010-06-25 19:04 [PATCH 00/38] Union mounts - multiple layers and submounts Valerie Aurora
2010-06-25 19:05 ` [PATCH 18/38] union-mount: Introduce MNT_UNION and MS_UNION flags Valerie Aurora
2010-06-15 18:39 [PATCH 00/38] Union mounts - union stack as linked list Valerie Aurora
2010-06-15 18:39 ` [PATCH 18/38] union-mount: Introduce MNT_UNION and MS_UNION flags Valerie Aurora

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1281134124-17041-19-git-send-email-vaurora@redhat.com \
    --to=vaurora@redhat.com \
    --cc=hch@infradead.org \
    --cc=jblunck@suse.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).