Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / fs / mount.h

diff --git a/fs/mount.h b/fs/mount.h
index 6250de544760e1ed28bd1e91df35f45ad29d9e8c..711a4093e475e9fdf9fb8df1d81ab289ee33a498 100644 (file)
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -58,7 +58,10 @@ struct mount {
        struct mount *mnt_master;       /* slave is on master->mnt_slave_list */
        struct mnt_namespace *mnt_ns;   /* containing namespace */
        struct mountpoint *mnt_mp;      /* where is it mounted */
-       struct hlist_node mnt_mp_list;  /* list mounts with the same mountpoint */
+       union {
+               struct hlist_node mnt_mp_list;  /* list mounts with the same mountpoint */
+               struct hlist_node mnt_umount;
+       };
        struct list_head mnt_umounting; /* list entry for umount propagation */
 #ifdef CONFIG_FSNOTIFY
        struct fsnotify_mark_connector __rcu *mnt_fsnotify_marks;
@@ -68,8 +71,7 @@ struct mount {
        int mnt_group_id;               /* peer group identifier */
        int mnt_expiry_mark;            /* true if marked for expiry */
        struct hlist_head mnt_pins;
-       struct fs_pin mnt_umount;
-       struct dentry *mnt_ex_mountpoint;
+       struct hlist_head mnt_stuck_children;
 } __randomize_layout;
 
 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */