Merge branch 'master' into for-next

Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 3b22bbdee9ec..439ae6886507 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -31,6 +31,7 @@ static void proc_evict_inode(struct inode *inode)
         struct proc_dir_entry *de;
         struct ctl_table_header *head;
         const struct proc_ns_operations *ns_ops;
+        void *ns;
 
         truncate_inode_pages(&inode->i_data, 0);
         clear_inode(inode);
@@ -49,8 +50,9 @@ static void proc_evict_inode(struct inode *inode)
         }
         /* Release any associated namespace */
         ns_ops = PROC_I(inode)->ns_ops;
-        if (ns_ops && ns_ops->put)
-                ns_ops->put(PROC_I(inode)->ns);
+        ns = PROC_I(inode)->ns;
+        if (ns_ops && ns)
+                ns_ops->put(ns);
 }
 
 static struct kmem_cache * proc_inode_cachep;