aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-19 12:55:10 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:11 -0400
commit3bfa784a6539f91a27d7ffdd408efdb638e3bebd (patch)
tree2fb293076c98a4bbc18fd2ddad7fdc4cea08c384 /kernel
parent1b5d783c94c328d406e801566f161adcfb018dda (diff)
kill file_permission() completely
convert the last remaining caller to inode_permission() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 2731d115d725..e1c72c0f512b 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3542,7 +3542,8 @@ static int cgroup_write_event_control(struct cgroup *cgrp, struct cftype *cft,
3542 } 3542 }
3543 3543
3544 /* the process need read permission on control file */ 3544 /* the process need read permission on control file */
3545 ret = file_permission(cfile, MAY_READ); 3545 /* AV: shouldn't we check that it's been opened for read instead? */
3546 ret = inode_permission(cfile->f_path.dentry->d_inode, MAY_READ);
3546 if (ret < 0) 3547 if (ret < 0)
3547 goto fail; 3548 goto fail;
3548 3549