Merge branch 'dma-buf-merge' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / include / linux / mount.h

diff --git a/include/linux/mount.h b/include/linux/mount.h
index cc01ed1..d7029f4 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -50,27 +50,7 @@ struct mnt_namespace;
 struct vfsmount {
        struct dentry *mnt_root;        /* root of the mounted tree */
        struct super_block *mnt_sb;     /* pointer to superblock */
-       struct list_head mnt_mounts;    /* list of children, anchored here */
-       struct list_head mnt_child;     /* and going through their mnt_child */
        int mnt_flags;
-       /* 4 bytes hole on 64bits arches without fsnotify */
-#ifdef CONFIG_FSNOTIFY
-       __u32 mnt_fsnotify_mask;
-       struct hlist_head mnt_fsnotify_marks;
-#endif
-       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 vfsmount *mnt_master;    /* slave is on master->mnt_slave_list */
-       struct mnt_namespace *mnt_ns;   /* containing namespace */
-       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;
 };
 
 struct file; /* forward dec */