summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authoryan <clouds.yan@gmail.com>2012-10-05 02:15:41 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 20:05:18 +0200
commit0e06936057674ef3f2bd0b398a32ddc512642992 (patch)
tree40b41684f6fe18ef45486e1d522bbca9e791bcda /fs
parentproc: return -ENOMEM when inode allocation failed (diff)
downloadlinux-0e06936057674ef3f2bd0b398a32ddc512642992.tar.xz
linux-0e06936057674ef3f2bd0b398a32ddc512642992.zip
proc: no need to initialize proc_inode->fd in proc_get_inode()
proc_get_inode() obtains the inode via a call to iget_locked(). iget_locked() calls alloc_inode() which will call proc_alloc_inode() which clears proc_inode.fd, so there is no need to clear this field in proc_get_inode(). If iget_locked() instead found the inode via find_inode_fast(), that inode will not have I_NEW set so this change has no effect. Signed-off-by: yan <clouds.yan@gmail.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/inode.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 7ac817b64a71..3b22bbdee9ec 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -450,7 +450,6 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
return NULL;
if (inode->i_state & I_NEW) {
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
- PROC_I(inode)->fd = 0;
PROC_I(inode)->pde = de;
if (de->mode) {