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, 4 insertions, 11 deletions

diff --git a/fs/afs/write.c b/fs/afs/write.c
index 106e43db1115..11dd0526b96b 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -308,7 +308,7 @@ static void afs_kill_pages(struct afs_vnode *vnode, bool error,
         _enter("{%x:%u},%lx-%lx",
                vnode->fid.vid, vnode->fid.vnode, first, last);
 
-        pagevec_init(&pv, 0);
+        pagevec_init(&pv);
 
         do {
                 _debug("kill %lx-%lx", first, last);
@@ -497,20 +497,13 @@ static int afs_writepages_region(struct address_space *mapping,
         _enter(",,%lx,%lx,", index, end);
 
         do {
-                n = find_get_pages_tag(mapping, &index, PAGECACHE_TAG_DIRTY,
-                                       1, &page);
+                n = find_get_pages_range_tag(mapping, &index, end,
+                                        PAGECACHE_TAG_DIRTY, 1, &page);
                 if (!n)
                         break;
 
                 _debug("wback %lx", page->index);
 
-                if (page->index > end) {
-                        *_next = index;
-                        put_page(page);
-                        _leave(" = 0 [%lx]", *_next);
-                        return 0;
-                }
-
                 /* at this point we hold neither mapping->tree_lock nor lock on
                  * the page itself: the page may be truncated or invalidated
                  * (changing page->mapping to NULL), or even swizzled back from
@@ -609,7 +602,7 @@ void afs_pages_written_back(struct afs_vnode *vnode, struct afs_call *call)
 
         ASSERT(wb != NULL);
 
-        pagevec_init(&pv, 0);
+        pagevec_init(&pv);
 
         do {
                 _debug("done %lx-%lx", first, last);