Merge commit 'v2.6.36' into kbuild/misc

Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).

1 files changed, 18 insertions, 5 deletions

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 5d5275364867..5e7a59408dd4 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -27,14 +27,24 @@ struct mnt_namespace;
 #define MNT_NODIRATIME  0x10
 #define MNT_RELATIME    0x20
 #define MNT_READONLY    0x40    /* does the user want this to be r/o? */
-#define MNT_STRICTATIME 0x80
 
 #define MNT_SHRINKABLE  0x100
 #define MNT_WRITE_HOLD  0x200
 
 #define MNT_SHARED      0x1000  /* if the vfsmount is a shared mount */
 #define MNT_UNBINDABLE  0x2000  /* if the vfsmount is a unbindable mount */
-#define MNT_PNODE_MASK  0x3000  /* propagation flag mask */
+/*
+ * MNT_SHARED_MASK is the set of flags that should be cleared when a
+ * mount becomes shared.  Currently, this is only the flag that says a
+ * mount cannot be bind mounted, since this is how we create a mount
+ * that shares events with another mount.  If you add a new MNT_*
+ * flag, consider how it interacts with shared mounts.
+ */
+#define MNT_SHARED_MASK (MNT_UNBINDABLE)
+#define MNT_PROPAGATION_MASK    (MNT_SHARED | MNT_UNBINDABLE)
+
+
+#define MNT_INTERNAL    0x4000
 
 struct vfsmount {
         struct list_head mnt_hash;
@@ -45,7 +55,11 @@ struct vfsmount {
         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 */
+        /* 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 */
@@ -66,7 +80,7 @@ struct vfsmount {
         int mnt_pinned;
         int mnt_ghosts;
 #ifdef CONFIG_SMP
-        int *mnt_writers;
+        int __percpu *mnt_writers;
 #else
         int mnt_writers;
 #endif
@@ -123,7 +137,6 @@ extern int do_add_mount(struct vfsmount *newmnt, struct path *path,
 
 extern void mark_mounts_for_expiry(struct list_head *mounts);
 
-extern spinlock_t vfsmount_lock;
 extern dev_t name_to_dev_t(char *name);
 
 #endif /* _LINUX_MOUNT_H */