diff --git a/[refs] b/[refs] index c597d0f4f84c..1b9016c3879b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 167965495153ba9829d0a34b6800dbf5d94de8c8 +refs/heads/master: 87bfbf679ffb1e95dd9ada694f66aafc4bfa5959 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 0762bc34d98b..fa0e6bee40fa 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -1371,7 +1371,7 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st ei->type = ino; inode->i_uid = 0; inode->i_gid = 0; - if (ino == PROC_TGID_INO || ino == PROC_TID_INO || task_dumpable(task)) { + if (task_dumpable(task)) { inode->i_uid = task->euid; inode->i_gid = task->egid; } @@ -1400,7 +1400,7 @@ static int pid_revalidate(struct dentry *dentry, struct nameidata *nd) struct inode *inode = dentry->d_inode; struct task_struct *task = proc_task(inode); if (pid_alive(task)) { - if (proc_type(inode) == PROC_TGID_INO || proc_type(inode) == PROC_TID_INO || task_dumpable(task)) { + if (task_dumpable(task)) { inode->i_uid = task->euid; inode->i_gid = task->egid; } else {