Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

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

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 9b4e0071b92ef4625b200e91a234c8b7473f8cdc..1b7e178b0d8472549de308667343b15d4f44aa56 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -17,11 +17,17 @@
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
 
+struct super_block;
+struct vfsmount;
+struct dentry;
+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_RELATIME   0x20
 
 #define MNT_SHRINKABLE 0x100
 
@@ -47,7 +53,7 @@ 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;
 };