vfs: move fsnotify junk to struct mount

[deliverable/linux.git] / fs / mount.h

diff --git a/fs/mount.h b/fs/mount.h
index 7890e49f74efae8e28bbfdc47439c249b43ba196..e094c863c8af54a94c161ffb93bb3580f3f98d50 100644 (file)
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -1,6 +1,51 @@
 #include <linux/mount.h>
 
-static inline int mnt_has_parent(struct vfsmount *mnt)
+struct mnt_pcp {
+       int mnt_count;
+       int mnt_writers;
+};
+
+struct mount {
+       struct list_head mnt_hash;
+       struct mount *mnt_parent;
+       struct dentry *mnt_mountpoint;
+       struct vfsmount mnt;
+#ifdef CONFIG_SMP
+       struct mnt_pcp __percpu *mnt_pcp;
+       atomic_t mnt_longterm;          /* how many of the refs are longterm */
+#else
+       int mnt_count;
+       int mnt_writers;
+#endif
+       struct list_head mnt_mounts;    /* list of children, anchored here */
+       struct list_head mnt_child;     /* and going through their mnt_child */
+       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 */
+       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 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 */
+       int mnt_pinned;
+       int mnt_ghosts;
+};
+
+static inline struct mount *real_mount(struct vfsmount *mnt)
+{
+       return container_of(mnt, struct mount, mnt);
+}
+
+static inline int mnt_has_parent(struct mount *mnt)
 {
        return mnt != mnt->mnt_parent;
 }
+
+extern struct mount *__lookup_mnt(struct vfsmount *, struct dentry *, int);