Driver core: add suspend() and resume() to struct device_type

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

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 60718f1..dab69af 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -20,13 +20,16 @@
 struct super_block;
 struct vfsmount;
 struct dentry;
-struct namespace;
+struct mnt_namespace;
 
 #define MNT_NOSUID     0x01
 #define MNT_NODEV      0x02
 #define MNT_NOEXEC     0x04
 #define MNT_NOATIME    0x08
 #define MNT_NODIRATIME 0x10
+#define MNT_RELATIME   0x20
+
+#define MNT_SHRINKABLE 0x100
 
 #define MNT_SHARED     0x1000  /* if the vfsmount is a shared mount */
 #define MNT_UNBINDABLE 0x2000  /* if the vfsmount is a unbindable mount */
@@ -40,9 +43,8 @@ struct vfsmount {
        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 */
-       atomic_t mnt_count;
        int mnt_flags;
-       int mnt_expiry_mark;            /* true if marked for expiry */
+       /* 4 bytes hole on 64bits arches */
        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 */
@@ -50,7 +52,14 @@ struct vfsmount {
        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 namespace *mnt_namespace; /* containing namespace */
+       struct mnt_namespace *mnt_ns;   /* containing namespace */
+       /*
+        * We put mnt_count & mnt_expiry_mark at the end of struct vfsmount
+        * to let these frequently modified fields in a separate cache line
+        * (so that reads of mnt_flags wont ping-pong on SMP machines)
+        */
+       atomic_t mnt_count;
+       int mnt_expiry_mark;            /* true if marked for expiry */
        int mnt_pinned;
 };
 
@@ -78,12 +87,18 @@ extern struct vfsmount *alloc_vfsmnt(const char *name);
 extern struct vfsmount *do_kern_mount(const char *fstype, int flags,
                                      const char *name, void *data);
 
+struct file_system_type;
+extern struct vfsmount *vfs_kern_mount(struct file_system_type *type,
+                                     int flags, const char *name,
+                                     void *data);
+
 struct nameidata;
 
 extern int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd,
                        int mnt_flags, struct list_head *fslist);
 
 extern void mark_mounts_for_expiry(struct list_head *mounts);
+extern void shrink_submounts(struct vfsmount *mountpoint, struct list_head *mounts);
 
 extern spinlock_t vfsmount_lock;
 extern dev_t name_to_dev_t(char *name);