Merge branch 'akpm' (patches from Andrew)

Merge misc updates from Andrew Morton:

 - a few misc things

 - ocfs2 updates

 - most of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (159 commits)
  tools/testing/selftests/proc/proc-self-syscall.c: remove duplicate include
  proc: more robust bulk read test
  proc: test /proc/*/maps, smaps, smaps_rollup, statm
  proc: use seq_puts() everywhere
  proc: read kernel cpu stat pointer once
  proc: remove unused argument in proc_pid_lookup()
  fs/proc/thread_self.c: code cleanup for proc_setup_thread_self()
  fs/proc/self.c: code cleanup for proc_setup_self()
  proc: return exit code 4 for skipped tests
  mm,mremap: bail out earlier in mremap_to under map pressure
  mm/sparse: fix a bad comparison
  mm/memory.c: do_fault: avoid usage of stale vm_area_struct
  writeback: fix inode cgroup switching comment
  mm/huge_memory.c: fix "orig_pud" set but not used
  mm/hotplug: fix an imbalance with DEBUG_PAGEALLOC
  mm/memcontrol.c: fix bad line in comment
  mm/cma.c: cma_declare_contiguous: correct err handling
  mm/page_ext.c: fix an imbalance with kmemleak
  mm/compaction: pass pgdat to too_many_isolated() instead of zone
  mm: remove zone_lru_lock() function, access ->lru_lock directly
  ...

1 files changed, 20 insertions, 11 deletions

diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index f8d5021a652e..ae948aaa4c53 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -832,26 +832,35 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
  * to see if it supports poll (Neither 'poll' nor 'select' return
  * an appropriate error code).  When in doubt, set a suitable timeout value.
  */
+__poll_t kernfs_generic_poll(struct kernfs_open_file *of, poll_table *wait)
+{
+        struct kernfs_node *kn = kernfs_dentry_node(of->file->f_path.dentry);
+        struct kernfs_open_node *on = kn->attr.open;
+
+        poll_wait(of->file, &on->poll, wait);
+
+        if (of->event != atomic_read(&on->event))
+                return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;
+
+        return DEFAULT_POLLMASK;
+}
+
 static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait)
 {
         struct kernfs_open_file *of = kernfs_of(filp);
         struct kernfs_node *kn = kernfs_dentry_node(filp->f_path.dentry);
-        struct kernfs_open_node *on = kn->attr.open;
+        __poll_t ret;
 
         if (!kernfs_get_active(kn))
-                goto trigger;
+                return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;
 
-        poll_wait(filp, &on->poll, wait);
+        if (kn->attr.ops->poll)
+                ret = kn->attr.ops->poll(of, wait);
+        else
+                ret = kernfs_generic_poll(of, wait);
 
         kernfs_put_active(kn);
-
-        if (of->event != atomic_read(&on->event))
-                goto trigger;
-
-        return DEFAULT_POLLMASK;
-
- trigger:
-        return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;
+        return ret;
 }
 
 static void kernfs_notify_workfn(struct work_struct *work)