netprio_cgroup: use cgroup->id instead of cgroup_netprio_state->prioidx

[deliverable/linux.git] / include / net / netprio_cgroup.h

diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
index 2760f4f4ae9b6779a7abd721b4ab428eb6c688fa..1d04b6f0fbd42e2dff23663c8ac21b8b8d6a16cf 100644 (file)
--- a/include/net/netprio_cgroup.h
+++ b/include/net/netprio_cgroup.h
@@ -27,7 +27,6 @@ struct netprio_map {
 
 struct cgroup_netprio_state {
        struct cgroup_subsys_state css;
-       u32 prioidx;
 };
 
 extern void sock_update_netprioidx(struct sock *sk, struct task_struct *task);
@@ -36,13 +35,12 @@ extern void sock_update_netprioidx(struct sock *sk, struct task_struct *task);
 
 static inline u32 task_netprioidx(struct task_struct *p)
 {
-       struct cgroup_netprio_state *state;
+       struct cgroup_subsys_state *css;
        u32 idx;
 
        rcu_read_lock();
-       state = container_of(task_subsys_state(p, net_prio_subsys_id),
-                            struct cgroup_netprio_state, css);
-       idx = state->prioidx;
+       css = task_subsys_state(p, net_prio_subsys_id);
+       idx = css->cgroup->id;
        rcu_read_unlock();
        return idx;
 }
@@ -57,8 +55,7 @@ static inline u32 task_netprioidx(struct task_struct *p)
        rcu_read_lock();
        css = task_subsys_state(p, net_prio_subsys_id);
        if (css)
-               idx = container_of(css,
-                                  struct cgroup_netprio_state, css)->prioidx;
+               idx = css->cgroup->id;
        rcu_read_unlock();
        return idx;
 }