diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-11-24 11:21:25 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-11-24 11:21:25 +1100 |
| commit | 0821e30cd2f246a93c5271f6c23d7134f809d70d (patch) | |
| tree | c2f62952279ebd70df908b3d4e0fabb50082d97f /fs/proc/fd.c | |
| parent | b075361e91684f8b9d4a85ad2e6f62f94d6698e3 (diff) | |
| parent | 9287aed2ad1ff1bde5eb190bcd6dccd5f1cf47d3 (diff) | |
| download | linux-0821e30cd2f246a93c5271f6c23d7134f809d70d.tar.bz2 | |
Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'fs/proc/fd.c')
| -rw-r--r-- | fs/proc/fd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/proc/fd.c b/fs/proc/fd.c index d21dafef3102..4274f83bf100 100644 --- a/fs/proc/fd.c +++ b/fs/proc/fd.c @@ -183,14 +183,13 @@ proc_fd_instantiate(struct inode *dir, struct dentry *dentry, struct proc_inode *ei; struct inode *inode; - inode = proc_pid_make_inode(dir->i_sb, task); + inode = proc_pid_make_inode(dir->i_sb, task, S_IFLNK); if (!inode) goto out; ei = PROC_I(inode); ei->fd = fd; - inode->i_mode = S_IFLNK; inode->i_op = &proc_pid_link_inode_operations; inode->i_size = 64; @@ -322,14 +321,13 @@ proc_fdinfo_instantiate(struct inode *dir, struct dentry *dentry, struct proc_inode *ei; struct inode *inode; - inode = proc_pid_make_inode(dir->i_sb, task); + inode = proc_pid_make_inode(dir->i_sb, task, S_IFREG | S_IRUSR); if (!inode) goto out; ei = PROC_I(inode); ei->fd = fd; - inode->i_mode = S_IFREG | S_IRUSR; inode->i_fop = &proc_fdinfo_file_operations; d_set_d_op(dentry, &tid_fd_dentry_operations); |