Merge remote-tracking branch 'asoc/fix/arizona' into tmp

[~andy/linux] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 38f5c119b806dbcc5bc7c6dda10fcbc5cb15c100..a86aebc9ba7c252bbfa73907612b59c177fca202 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -13,6 +13,7 @@
 #include <linux/stat.h>
 #include <linux/completion.h>
 #include <linux/poll.h>
+#include <linux/printk.h>
 #include <linux/file.h>
 #include <linux/limits.h>
 #include <linux/init.h>
@@ -445,12 +446,9 @@ static const struct file_operations proc_reg_file_ops_no_compat = {
 
 struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
 {
-       struct inode * inode;
+       struct inode *inode = iget_locked(sb, de->low_ino);
 
-       inode = iget_locked(sb, de->low_ino);
-       if (!inode)
-               return NULL;
-       if (inode->i_state & I_NEW) {
+       if (inode && (inode->i_state & I_NEW)) {
                inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
                PROC_I(inode)->pde = de;
 
@@ -482,10 +480,12 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
        } else
               pde_put(de);
        return inode;
-}                      
+}
 
 int proc_fill_super(struct super_block *s)
 {
+       struct inode *root_inode;
+
        s->s_flags |= MS_NODIRATIME | MS_NOSUID | MS_NOEXEC;
        s->s_blocksize = 1024;
        s->s_blocksize_bits = 10;
@@ -494,11 +494,17 @@ int proc_fill_super(struct super_block *s)
        s->s_time_gran = 1;
        
        pde_get(&proc_root);
-       s->s_root = d_make_root(proc_get_inode(s, &proc_root));
-       if (s->s_root)
-               return 0;
+       root_inode = proc_get_inode(s, &proc_root);
+       if (!root_inode) {
+               pr_err("proc_fill_super: get root inode failed\n");
+               return -ENOMEM;
+       }
 
-       printk("proc_read_super: get root inode failed\n");
-       pde_put(&proc_root);
-       return -ENOMEM;
+       s->s_root = d_make_root(root_inode);
+       if (!s->s_root) {
+               pr_err("proc_fill_super: allocate dentry failed\n");
+               return -ENOMEM;
+       }
+
+       return 0;
 }