---

yaml --- r: 292326 b: refs/heads/master c: 6b4231e h: refs/heads/master v: v3
git-mirror · Mar 21, 2012 · d6820d8 · d6820d8
1 parent 47785db
commit d6820d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be0d93f0aa5682a24a2a9ec0dd26fffaad608cce
+refs/heads/master: 6b4231e2f92adbcf96fb2a3fa751d7ca0a61b21f
diff --git a/trunk/fs/proc/inode.c b/trunk/fs/proc/inode.c
@@ -499,16 +499,15 @@ int proc_fill_super(struct super_block *s)
 	root_inode = proc_get_inode(s, &proc_root);
 	if (!root_inode)
 		goto out_no_root;
-	root_inode->i_uid = 0;
-	root_inode->i_gid = 0;
 	s->s_root = d_alloc_root(root_inode);
-	if (!s->s_root)
+	if (!s->s_root) {
+		iput(root_inode);
 		goto out_no_root;
+	}
 	return 0;
 
 out_no_root:
 	printk("proc_read_super: get root inode failed\n");
-	iput(root_inode);
 	pde_put(&proc_root);
 	return -ENOMEM;
 }