Merge branch 'master'

[linux-2.6] / include / linux / mount.h

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 2582559718fccfe31696c6e8e03cc7164849c8ff..b7472ae91fa4a8396e9eaa9a2bedb6c1af916b64 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -20,8 +20,12 @@
 #define MNT_NOSUID     0x01
 #define MNT_NODEV      0x02
 #define MNT_NOEXEC     0x04
-#define MNT_SHARED     0x10    /* if the vfsmount is a shared mount */
-#define MNT_PNODE_MASK 0x30    /* propogation flag mask */
+#define MNT_NOATIME    0x08
+#define MNT_NODIRATIME 0x10
+
+#define MNT_SHARED     0x1000  /* if the vfsmount is a shared mount */
+#define MNT_UNBINDABLE 0x2000  /* if the vfsmount is a unbindable mount */
+#define MNT_PNODE_MASK 0x3000  /* propogation flag mask */
 
 struct vfsmount {
        struct list_head mnt_hash;
@@ -38,6 +42,9 @@ struct vfsmount {
        struct list_head mnt_list;
        struct list_head mnt_expire;    /* link in fs-specific expiry list */
        struct list_head mnt_share;     /* circular list of shared mounts */
+       struct list_head mnt_slave_list;/* list of slave mounts */
+       struct list_head mnt_slave;     /* slave list entry */
+       struct vfsmount *mnt_master;    /* slave is on master->mnt_slave_list */
        struct namespace *mnt_namespace; /* containing namespace */
        int mnt_pinned;
 };