Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361607
b: refs/heads/master
c: 51f0885
h: refs/heads/master
i:
  361605: 39a03bd
  361603: 15917f6
  361599: 445f1b1
v: v3
  • Loading branch information
Linus Torvalds committed Mar 22, 2013
1 parent 0aad376 commit 311c31a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9217cbb8df31c10efc96362227b2ebdbb9fe996c
refs/heads/master: 51f0885e5415b4cc6535e9cdcc5145bfbc134353
6 changes: 3 additions & 3 deletions trunk/fs/proc/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,10 @@ 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 = iget_locked(sb, de->low_ino);
struct inode *inode = new_inode_pseudo(sb);

if (inode && (inode->i_state & I_NEW)) {
if (inode) {
inode->i_ino = de->low_ino;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
PROC_I(inode)->pde = de;

Expand Down Expand Up @@ -476,7 +477,6 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
inode->i_fop = de->proc_fops;
}
}
unlock_new_inode(inode);
} else
pde_put(de);
return inode;
Expand Down

0 comments on commit 311c31a

Please sign in to comment.