vfs: move fsnotify junk to struct mount

[mirror_ubuntu-zesty-kernel.git] / fs / mount.h

diff --git a/fs/mount.h b/fs/mount.h
index c5fc3f7a9580dca3ae740217fbb5e84b548165e2..e094c863c8af54a94c161ffb93bb3580f3f98d50 100644 (file)
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -19,7 +19,6 @@ 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 */
        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 +27,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 */