fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 42d699c..ffc7efa 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -20,14 +20,15 @@
 struct super_block;
 struct vfsmount;
 struct dentry;
-struct namespace;
+struct mnt_namespace;
 
 #define MNT_NOSUID     0x01
 #define MNT_NODEV      0x02
 #define MNT_NOEXEC     0x04
 #define MNT_NOATIME    0x08
 #define MNT_NODIRATIME 0x10
-#define MNT_RDONLY     0x20
+#define MNT_RELATIME   0x20
+#define MNT_RDONLY     0x40
 
 #define MNT_IS_RDONLY(m)       ((m) && ((m)->mnt_flags & MNT_RDONLY))
 
@@ -36,7 +37,7 @@ struct namespace;
 #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 */
-#define MNT_XID                0x8000
+#define MNT_TAGID      0x8000
 
 struct vfsmount {
        struct list_head mnt_hash;
@@ -56,9 +57,9 @@ struct vfsmount {
        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 */
+       struct mnt_namespace *mnt_ns;   /* containing namespace */
        int mnt_pinned;
-       xid_t mnt_xid;                  /* xid tagging used for vfsmount */
+       tag_t mnt_tag;                  /* tagging used for vfsmount */
 };
 
 static inline struct vfsmount *mntget(struct vfsmount *mnt)