summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRam Pai <linuxram@us.ibm.com>2005-11-07 17:19:33 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 18:18:10 -0800
commit03e06e68ff76294e53ffa898cb844d2a997b043e (patch)
treedf17444b2c9b89e1eed75e09d46ea36c40ebd1df /fs
parent07b20889e3052c7e77d6a6a54e7e83446eb1ba84 (diff)
[PATCH] introduce shared mounts
This creates shared mounts. A shared mount when bind-mounted to some mountpoint, propagates mount/umount events to each other. All the shared mounts that propagate events to each other belong to the same peer-group. Signed-off-by: Ram Pai <linuxram@us.ibm.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/namespace.c3
-rw-r--r--fs/pnode.c13
-rw-r--r--fs/pnode.h4
3 files changed, 18 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 3782923d6d4d..f6861a5487df 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -68,6 +68,7 @@ struct vfsmount *alloc_vfsmnt(const char *name)
INIT_LIST_HEAD(&mnt->mnt_mounts);
INIT_LIST_HEAD(&mnt->mnt_list);
INIT_LIST_HEAD(&mnt->mnt_expire);
+ INIT_LIST_HEAD(&mnt->mnt_share);
if (name) {
int size = strlen(name) + 1;
char *newname = kmalloc(size, GFP_KERNEL);
@@ -1113,7 +1114,7 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
data_page);
else if (flags & MS_BIND)
retval = do_loopback(&nd, dev_name, flags & MS_REC);
- else if (flags & MS_PRIVATE)
+ else if (flags & (MS_SHARED | MS_PRIVATE))
retval = do_change_type(&nd, flags);
else if (flags & MS_MOVE)
retval = do_move_mount(&nd, dev_name);
diff --git a/fs/pnode.c b/fs/pnode.c
index aaa0dffda12a..1e22165ea41f 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -11,7 +11,18 @@
#include <linux/fs.h>
#include "pnode.h"
+/* return the next shared peer mount of @p */
+static inline struct vfsmount *next_peer(struct vfsmount *p)
+{
+ return list_entry(p->mnt_share.next, struct vfsmount, mnt_share);
+}
+
void change_mnt_propagation(struct vfsmount *mnt, int type)
{
- mnt->mnt_flags &= ~MNT_PNODE_MASK;
+ if (type == MS_SHARED) {
+ mnt->mnt_flags |= MNT_SHARED;
+ } else {
+ list_del_init(&mnt->mnt_share);
+ mnt->mnt_flags &= ~MNT_PNODE_MASK;
+ }
}
diff --git a/fs/pnode.h b/fs/pnode.h
index 33549a3a74eb..ab1bdaee4e08 100644
--- a/fs/pnode.h
+++ b/fs/pnode.h
@@ -10,5 +10,9 @@
#include <linux/list.h>
#include <linux/mount.h>
+
+#define IS_MNT_SHARED(mnt) (mnt->mnt_flags & MNT_SHARED)
+#define CLEAR_MNT_SHARED(mnt) (mnt->mnt_flags &= ~MNT_SHARED)
+
void change_mnt_propagation(struct vfsmount *, int);
#endif /* _LINUX_PNODE_H */