aboutsummaryrefslogtreecommitdiffstats
path: root/security/device_cgroup.c
diff options
context:
space:
mode:
Diffstat (limited to 'security/device_cgroup.c')
-rw-r--r--security/device_cgroup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 7293ac49ba7b..e0ca464fa854 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -289,10 +289,10 @@ static void set_majmin(char *str, unsigned m)
289 sprintf(str, "%u", m); 289 sprintf(str, "%u", m);
290} 290}
291 291
292static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft, 292static int devcgroup_seq_read(struct cgroup_subsys_state *css,
293 struct seq_file *m) 293 struct cftype *cft, struct seq_file *m)
294{ 294{
295 struct dev_cgroup *devcgroup = cgroup_to_devcgroup(cgroup); 295 struct dev_cgroup *devcgroup = css_to_devcgroup(css);
296 struct dev_exception_item *ex; 296 struct dev_exception_item *ex;
297 char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN]; 297 char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN];
298 298
@@ -669,13 +669,13 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
669 return rc; 669 return rc;
670} 670}
671 671
672static int devcgroup_access_write(struct cgroup *cgrp, struct cftype *cft, 672static int devcgroup_access_write(struct cgroup_subsys_state *css,
673 const char *buffer) 673 struct cftype *cft, const char *buffer)
674{ 674{
675 int retval; 675 int retval;
676 676
677 mutex_lock(&devcgroup_mutex); 677 mutex_lock(&devcgroup_mutex);
678 retval = devcgroup_update_access(cgroup_to_devcgroup(cgrp), 678 retval = devcgroup_update_access(css_to_devcgroup(css),
679 cft->private, buffer); 679 cft->private, buffer);
680 mutex_unlock(&devcgroup_mutex); 680 mutex_unlock(&devcgroup_mutex);
681 return retval; 681 return retval;