diff options
Diffstat (limited to 'block/blk-cgroup.c')
-rw-r--r-- | block/blk-cgroup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 87ea95d1f533..b2b9837f9dd3 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c | |||
@@ -459,7 +459,6 @@ static int blkcg_reset_stats(struct cgroup *cgroup, struct cftype *cftype, | |||
459 | { | 459 | { |
460 | struct blkcg *blkcg = cgroup_to_blkcg(cgroup); | 460 | struct blkcg *blkcg = cgroup_to_blkcg(cgroup); |
461 | struct blkcg_gq *blkg; | 461 | struct blkcg_gq *blkg; |
462 | struct hlist_node *n; | ||
463 | int i; | 462 | int i; |
464 | 463 | ||
465 | mutex_lock(&blkcg_pol_mutex); | 464 | mutex_lock(&blkcg_pol_mutex); |
@@ -470,7 +469,7 @@ static int blkcg_reset_stats(struct cgroup *cgroup, struct cftype *cftype, | |||
470 | * stat updates. This is a debug feature which shouldn't exist | 469 | * stat updates. This is a debug feature which shouldn't exist |
471 | * anyway. If you get hit by a race, retry. | 470 | * anyway. If you get hit by a race, retry. |
472 | */ | 471 | */ |
473 | hlist_for_each_entry(blkg, n, &blkcg->blkg_list, blkcg_node) { | 472 | hlist_for_each_entry(blkg, &blkcg->blkg_list, blkcg_node) { |
474 | for (i = 0; i < BLKCG_MAX_POLS; i++) { | 473 | for (i = 0; i < BLKCG_MAX_POLS; i++) { |
475 | struct blkcg_policy *pol = blkcg_policy[i]; | 474 | struct blkcg_policy *pol = blkcg_policy[i]; |
476 | 475 | ||
@@ -518,11 +517,10 @@ void blkcg_print_blkgs(struct seq_file *sf, struct blkcg *blkcg, | |||
518 | bool show_total) | 517 | bool show_total) |
519 | { | 518 | { |
520 | struct blkcg_gq *blkg; | 519 | struct blkcg_gq *blkg; |
521 | struct hlist_node *n; | ||
522 | u64 total = 0; | 520 | u64 total = 0; |
523 | 521 | ||
524 | rcu_read_lock(); | 522 | rcu_read_lock(); |
525 | hlist_for_each_entry_rcu(blkg, n, &blkcg->blkg_list, blkcg_node) { | 523 | hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) { |
526 | spin_lock_irq(blkg->q->queue_lock); | 524 | spin_lock_irq(blkg->q->queue_lock); |
527 | if (blkcg_policy_enabled(blkg->q, pol)) | 525 | if (blkcg_policy_enabled(blkg->q, pol)) |
528 | total += prfill(sf, blkg->pd[pol->plid], data); | 526 | total += prfill(sf, blkg->pd[pol->plid], data); |