Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b3ff8a2f9569fb41b9cf8902897d787a33bac84f

Authored by Hugh Dickins
Committed by Tejun Heo
1 parent 8173d5a495
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

cgroup: remove stray references to css_id 

Trivial: remove the few stray references to css_id, which itself
was removed in v3.13's 2ff2a7d03bbe "cgroup: kill css_id".

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

Showing 3 changed files with 1 additions and 5 deletions Side-by-side Diff

drivers/md/bcache/request.c
Diff comments   View file @ b3ff8a2
... ... @@ -163,7 +163,6 @@
163 163 static void bcachecg_destroy(struct cgroup *cgroup)
164 164 {
165 165 struct bch_cgroup *cg = cgroup_to_bcache(cgroup);
166   - free_css_id(&bcache_subsys, &cg->css);
167 166 kfree(cg);
168 167 }
169 168  
include/linux/cgroup.h
Diff comments   View file @ b3ff8a2
... ... @@ -29,7 +29,6 @@
29 29 struct cgroup_subsys;
30 30 struct inode;
31 31 struct cgroup;
32   -struct css_id;
33 32  
34 33 extern int cgroup_init_early(void);
35 34 extern int cgroup_init(void);
... ... @@ -79,8 +78,6 @@
79 78 struct cgroup_subsys_state *parent;
80 79  
81 80 unsigned long flags;
82   - /* ID for this css, if possible */
83   - struct css_id __rcu *id;
84 81  
85 82 /* percpu_ref killing and RCU release */
86 83 struct rcu_head rcu_head;
... ... @@ -451,7 +451,7 @@
451 451 * lookup_swap_cgroup_id - lookup mem_cgroup id tied to swap entry
452 452 * @ent: swap entry to be looked up.
453 453 *
454   - * Returns CSS ID of mem_cgroup at success. 0 at failure. (0 is invalid ID)
  454 + * Returns ID of mem_cgroup at success. 0 at failure. (0 is invalid ID)
455 455 */
456 456 unsigned short lookup_swap_cgroup_id(swp_entry_t ent)
457 457 {