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, 8 insertions, 8 deletions

diff --git a/fs/proc/self.c b/fs/proc/self.c
index 127265e5c55f..57c0a1047250 100644
--- a/fs/proc/self.c
+++ b/fs/proc/self.c
@@ -38,6 +38,7 @@ int proc_setup_self(struct super_block *s)
         struct inode *root_inode = d_inode(s->s_root);
         struct pid_namespace *ns = proc_pid_ns(root_inode);
         struct dentry *self;
+        int ret = -ENOMEM;
         
         inode_lock(root_inode);
         self = d_alloc_name(s->s_root, "self");
@@ -51,20 +52,19 @@ int proc_setup_self(struct super_block *s)
                         inode->i_gid = GLOBAL_ROOT_GID;
                         inode->i_op = &proc_self_inode_operations;
                         d_add(self, inode);
+                        ret = 0;
                 } else {
                         dput(self);
-                        self = ERR_PTR(-ENOMEM);
                 }
-        } else {
-                self = ERR_PTR(-ENOMEM);
         }
         inode_unlock(root_inode);
-        if (IS_ERR(self)) {
+
+        if (ret)
                 pr_err("proc_fill_super: can't allocate /proc/self\n");
-                return PTR_ERR(self);
-        }
-        ns->proc_self = self;
-        return 0;
+        else
+                ns->proc_self = self;
+
+        return ret;
 }
 
 void __init proc_self_init(void)