Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / fs / mount.h

diff --git a/fs/mount.h b/fs/mount.h
index c5fc3f7..4ef36d9 100644 (file)
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -1,4 +1,14 @@
 #include <linux/mount.h>
+#include <linux/seq_file.h>
+#include <linux/poll.h>
+
+struct mnt_namespace {
+       atomic_t                count;
+       struct mount *  root;
+       struct list_head        list;
+       wait_queue_head_t poll;
+       int event;
+};
 
 struct mnt_pcp {
        int mnt_count;
@@ -19,7 +29,7 @@ struct mount {
 #endif
        struct list_head mnt_mounts;    /* list of children, anchored here */
        struct list_head mnt_child;     /* and going through their mnt_child */
-       /* yet to be moved - fsnotify ones go here */
+       struct list_head mnt_instance;  /* mount instance on sb->s_mounts */
        const char *mnt_devname;        /* Name of device e.g. /dev/dsk/hda1 */
        struct list_head mnt_list;
        struct list_head mnt_expire;    /* link in fs-specific expiry list */
@@ -28,6 +38,10 @@ struct mount {
        struct list_head mnt_slave;     /* slave list entry */
        struct mount *mnt_master;       /* slave is on master->mnt_slave_list */
        struct mnt_namespace *mnt_ns;   /* containing namespace */
+#ifdef CONFIG_FSNOTIFY
+       struct hlist_head mnt_fsnotify_marks;
+       __u32 mnt_fsnotify_mask;
+#endif
        int mnt_id;                     /* mount identifier */
        int mnt_group_id;               /* peer group identifier */
        int mnt_expiry_mark;            /* true if marked for expiry */
@@ -46,3 +60,17 @@ static inline int mnt_has_parent(struct mount *mnt)
 }
 
 extern struct mount *__lookup_mnt(struct vfsmount *, struct dentry *, int);
+
+static inline void get_mnt_ns(struct mnt_namespace *ns)
+{
+       atomic_inc(&ns->count);
+}
+
+struct proc_mounts {
+       struct seq_file m; /* must be the first element */
+       struct mnt_namespace *ns;
+       struct path root;
+       int (*show)(struct seq_file *, struct vfsmount *);
+};
+
+extern const struct seq_operations mounts_op;