Linux-libre 4.2-gnu

1 files changed, 4 insertions, 8 deletions

diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index 3ab7d1805..50777b5b1 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -26,13 +26,10 @@ struct shmem_inode_info {
 };
 
 struct shmem_sb_info {
-	struct mutex idr_lock;
-	bool idr_nouse;
-	struct idr idr;		    /* manages inode-number */
 	unsigned long max_blocks;   /* How many blocks are allowed */
 	struct percpu_counter used_blocks;  /* How many are allocated */
-	int max_inodes;		    /* How many inodes are allowed */
-	int free_inodes;	    /* 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;	    /* Serialize shmem_sb_info changes */
 	kuid_t uid;		    /* Mount uid for root directory */
 	kgid_t gid;		    /* Mount gid for root directory */
@@ -51,10 +48,9 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
 extern int shmem_init(void);
 extern int shmem_fill_super(struct super_block *sb, void *data, int silent);
 extern struct file *shmem_file_setup(const char *name,
-					loff_t size, unsigned long flags,
-					int atomic_copy);
+					loff_t size, unsigned long flags);
 extern struct file *shmem_kernel_file_setup(const char *name, loff_t size,
-					    unsigned long flags, int atomic_copy);
+					    unsigned long flags);
 extern int shmem_zero_setup(struct vm_area_struct *);
 extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
 extern bool shmem_mapping(struct address_space *mapping);