Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[pandora-kernel.git] / include / linux / mount.h

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 2582559..e357dc8 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -17,11 +17,22 @@
 #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_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_SHRINKABLE 0x100
+
+#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,7 +49,10 @@ 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 namespace *mnt_namespace; /* containing namespace */
+       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 mnt_namespace *mnt_ns;   /* containing namespace */
        int mnt_pinned;
 };
 
@@ -66,12 +80,18 @@ extern struct vfsmount *alloc_vfsmnt(const char *name);
 extern struct vfsmount *do_kern_mount(const char *fstype, int flags,
                                      const char *name, void *data);
 
+struct file_system_type;
+extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
+                                     int flags, const char *name,
+                                     void *data);
+
 struct nameidata;
 
 extern int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd,
                        int mnt_flags, struct list_head *fslist);
 
 extern void mark_mounts_for_expiry(struct list_head *mounts);
+extern void shrink_submounts(struct vfsmount *mountpoint, struct list_head *mounts);
 
 extern spinlock_t vfsmount_lock;
 extern dev_t name_to_dev_t(char *name);