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

[~andy/linux] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 75fe9a1348036c52b863fb47737eb6b0f9dd8789..035521b46528ace428c7f07d4aa49ac4880e145e 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -418,7 +418,7 @@ struct address_space {
        struct backing_dev_info *backing_dev_info; /* device readahead, etc */
        spinlock_t              private_lock;   /* for use by the address_space */
        struct list_head        private_list;   /* ditto */
-       struct address_space    *assoc_mapping; /* ditto */
+       void                    *private_data;  /* ditto */
 } __attribute__((aligned(sizeof(long))));
        /*
         * On most architectures that alignment is already the case; but
@@ -1810,6 +1810,8 @@ struct file_system_type {
 #define FS_REQUIRES_DEV                1 
 #define FS_BINARY_MOUNTDATA    2
 #define FS_HAS_SUBTYPE         4
+#define FS_USERNS_MOUNT                8       /* Can be mounted by userns root */
+#define FS_USERNS_DEV_MOUNT    16 /* A userns mount does not imply MNT_NODEV */
 #define FS_REVAL_DOT           16384   /* Check the paths ".", ".." for staleness */
 #define FS_RENAME_DOES_D_MOVE  32768   /* FS will handle d_move() during rename() internally. */
        struct dentry *(*mount) (struct file_system_type *, int,