Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:

 - a few misc bits

 - ocfs2 updates

 - almost all of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (131 commits)
  memory hotplug: fix comments when adding section
  mm: make alloc_node_mem_map a void call if we don't have CONFIG_FLAT_NODE_MEM_MAP
  mm: simplify nodemask printing
  mm,oom_reaper: remove pointless kthread_run() error check
  mm/page_ext.c: check if page_ext is not prepared
  writeback: remove unused function parameter
  mm: do not rely on preempt_count in print_vma_addr
  mm, sparse: do not swamp log with huge vmemmap allocation failures
  mm/hmm: remove redundant variable align_end
  mm/list_lru.c: mark expected switch fall-through
  mm/shmem.c: mark expected switch fall-through
  mm/page_alloc.c: broken deferred calculation
  mm: don't warn about allocations which stall for too long
  fs: fuse: account fuse_inode slab memory as reclaimable
  mm, page_alloc: fix potential false positive in __zone_watermark_ok
  mm: mlock: remove lru_add_drain_all()
  mm, sysctl: make NUMA stats configurable
  shmem: convert shmem_init_inodecache() to void
  Unify migrate_pages and move_pages access checks
  mm, pagevec: rename pagevec drained field
  ...

1 files changed, 7 insertions, 10 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 07a1d22807be..ab22eaa2412e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -338,7 +338,7 @@ static int shmem_radix_tree_replace(struct address_space *mapping,
         if (item != expected)
                 return -ENOENT;
         __radix_tree_replace(&mapping->page_tree, node, pslot,
-                             replacement, NULL, NULL);
+                             replacement, NULL);
         return 0;
 }
 
@@ -747,7 +747,7 @@ void shmem_unlock_mapping(struct address_space *mapping)
         pgoff_t indices[PAGEVEC_SIZE];
         pgoff_t index = 0;
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
         /*
          * Minor point, but we might as well stop if someone else SHM_LOCKs it.
          */
@@ -790,7 +790,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
         if (lend == -1)
                 end = -1;       /* unsigned, so actually very big */
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
         index = start;
         while (index < end) {
                 pvec.nr = find_get_entries(mapping, index,
@@ -2528,7 +2528,7 @@ static pgoff_t shmem_seek_hole_data(struct address_space *mapping,
         bool done = false;
         int i;
 
-        pagevec_init(&pvec, 0);
+        pagevec_init(&pvec);
         pvec.nr = 1;            /* start small: we may be there already */
         while (!done) {
                 pvec.nr = find_get_entries(mapping, index,
@@ -3862,12 +3862,11 @@ static void shmem_init_inode(void *foo)
         inode_init_once(&info->vfs_inode);
 }
 
-static int shmem_init_inodecache(void)
+static void shmem_init_inodecache(void)
 {
         shmem_inode_cachep = kmem_cache_create("shmem_inode_cache",
                                 sizeof(struct shmem_inode_info),
                                 0, SLAB_PANIC|SLAB_ACCOUNT, shmem_init_inode);
-        return 0;
 }
 
 static void shmem_destroy_inodecache(void)
@@ -3991,9 +3990,7 @@ int __init shmem_init(void)
         if (shmem_inode_cachep)
                 return 0;
 
-        error = shmem_init_inodecache();
-        if (error)
-                goto out3;
+        shmem_init_inodecache();
 
         error = register_filesystem(&shmem_fs_type);
         if (error) {
@@ -4020,7 +4017,6 @@ out1:
         unregister_filesystem(&shmem_fs_type);
 out2:
         shmem_destroy_inodecache();
-out3:
         shm_mnt = ERR_PTR(error);
         return error;
 }
@@ -4102,6 +4098,7 @@ bool shmem_huge_enabled(struct vm_area_struct *vma)
                         if (i_size >= HPAGE_PMD_SIZE &&
                                         i_size >> PAGE_SHIFT >= off)
                                 return true;
+                        /* fall through */
                 case SHMEM_HUGE_ADVISE:
                         /* TODO: implement fadvise() hints */
                         return (vma->vm_flags & VM_HUGEPAGE);