Input: fix locking in memoryless force-feedback devices

[safe/jmp/linux-2.6] / include / linux / shmem_fs.h

diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index c3e5982..deee7af 100644 (file)
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -26,7 +26,11 @@ struct shmem_sb_info {
        unsigned long free_blocks;  /* How many are left for allocation */
        unsigned long max_inodes;   /* How many inodes are allowed */
        unsigned long free_inodes;  /* How many are left for allocation */
-       spinlock_t    stat_lock;
+       spinlock_t stat_lock;       /* Serialize shmem_sb_info changes */
+       uid_t uid;                  /* Mount uid for root directory */
+       gid_t gid;                  /* Mount gid for root directory */
+       mode_t mode;                /* Mount mode for root directory */
+       struct mempolicy *mpol;     /* default memory policy for mappings */
 };
 
 static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
@@ -34,4 +38,23 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
        return container_of(inode, struct shmem_inode_info, vfs_inode);
 }
 
+extern int init_tmpfs(void);
+extern int shmem_fill_super(struct super_block *sb, void *data, int silent);
+
+#ifdef CONFIG_TMPFS_POSIX_ACL
+int shmem_check_acl(struct inode *, int);
+int shmem_acl_init(struct inode *, struct inode *);
+
+extern struct xattr_handler shmem_xattr_acl_access_handler;
+extern struct xattr_handler shmem_xattr_acl_default_handler;
+
+extern struct generic_acl_operations shmem_acl_ops;
+
+#else
+static inline int shmem_acl_init(struct inode *inode, struct inode *dir)
+{
+       return 0;
+}
+#endif  /* CONFIG_TMPFS_POSIX_ACL */
+
 #endif