1 files changed, 10 insertions, 5 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index bd20f8bb02aa..b206a7a32e2a 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -49,7 +49,6 @@ static struct vfsmount *shm_mnt;
 #include <linux/backing-dev.h>
 #include <linux/shmem_fs.h>
 #include <linux/writeback.h>
-#include <linux/vfs.h>
 #include <linux/blkdev.h>
 #include <linux/security.h>
 #include <linux/swapops.h>
@@ -1097,6 +1096,10 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
         shmem_swp_unmap(entry);
 unlock:
         spin_unlock(&info->lock);
+        /*
+         * add_to_swap_cache() doesn't return -EEXIST, so we can safely
+         * clear SWAP_HAS_CACHE flag.
+         */
         swapcache_free(swap, NULL);
 redirty:
         set_page_dirty(page);
@@ -2306,17 +2309,14 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
         int err = -ENOMEM;
 
         /* Round up to L1_CACHE_BYTES to resist false sharing */
-        sbinfo = kmalloc(max((int)sizeof(struct shmem_sb_info),
+        sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
                                 L1_CACHE_BYTES), GFP_KERNEL);
         if (!sbinfo)
                 return -ENOMEM;
 
-        sbinfo->max_blocks = 0;
-        sbinfo->max_inodes = 0;
         sbinfo->mode = S_IRWXUGO | S_ISVTX;
         sbinfo->uid = current_fsuid();
         sbinfo->gid = current_fsgid();
-        sbinfo->mpol = NULL;
         sb->s_fs_info = sbinfo;
 
 #ifdef CONFIG_TMPFS
@@ -2590,6 +2590,11 @@ int shmem_unuse(swp_entry_t entry, struct page *page)
         return 0;
 }
 
+int shmem_lock(struct file *file, int lock, struct user_struct *user)
+{
+        return 0;
+}
+
 #define shmem_vm_ops                            generic_file_vm_ops
 #define shmem_file_operations                   ramfs_file_operations
 #define shmem_get_inode(sb, mode, dev, flags)   ramfs_get_inode(sb, mode, dev)