diff options
-rw-r--r-- | block/blk-cgroup.h | 4 | ||||
-rw-r--r-- | block/cfq-iosched.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 678e89ed8ecb..586c0ac3309a 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h | |||
@@ -461,14 +461,14 @@ static inline struct blkg_rwstat blkg_rwstat_read(struct blkg_rwstat *rwstat) | |||
461 | } | 461 | } |
462 | 462 | ||
463 | /** | 463 | /** |
464 | * blkg_rwstat_sum - read the total count of a blkg_rwstat | 464 | * blkg_rwstat_total - read the total count of a blkg_rwstat |
465 | * @rwstat: blkg_rwstat to read | 465 | * @rwstat: blkg_rwstat to read |
466 | * | 466 | * |
467 | * Return the total count of @rwstat regardless of the IO direction. This | 467 | * Return the total count of @rwstat regardless of the IO direction. This |
468 | * function can be called without synchronization and takes care of u64 | 468 | * function can be called without synchronization and takes care of u64 |
469 | * atomicity. | 469 | * atomicity. |
470 | */ | 470 | */ |
471 | static inline uint64_t blkg_rwstat_sum(struct blkg_rwstat *rwstat) | 471 | static inline uint64_t blkg_rwstat_total(struct blkg_rwstat *rwstat) |
472 | { | 472 | { |
473 | struct blkg_rwstat tmp = blkg_rwstat_read(rwstat); | 473 | struct blkg_rwstat tmp = blkg_rwstat_read(rwstat); |
474 | 474 | ||
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index e8f31069b379..d43145cc0088 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -536,7 +536,7 @@ static void cfqg_stats_set_start_empty_time(struct cfq_group *cfqg) | |||
536 | { | 536 | { |
537 | struct cfqg_stats *stats = &cfqg->stats; | 537 | struct cfqg_stats *stats = &cfqg->stats; |
538 | 538 | ||
539 | if (blkg_rwstat_sum(&stats->queued)) | 539 | if (blkg_rwstat_total(&stats->queued)) |
540 | return; | 540 | return; |
541 | 541 | ||
542 | /* | 542 | /* |
@@ -580,7 +580,7 @@ static void cfqg_stats_update_avg_queue_size(struct cfq_group *cfqg) | |||
580 | struct cfqg_stats *stats = &cfqg->stats; | 580 | struct cfqg_stats *stats = &cfqg->stats; |
581 | 581 | ||
582 | blkg_stat_add(&stats->avg_queue_size_sum, | 582 | blkg_stat_add(&stats->avg_queue_size_sum, |
583 | blkg_rwstat_sum(&stats->queued)); | 583 | blkg_rwstat_total(&stats->queued)); |
584 | blkg_stat_add(&stats->avg_queue_size_samples, 1); | 584 | blkg_stat_add(&stats->avg_queue_size_samples, 1); |
585 | cfqg_stats_update_group_wait_time(stats); | 585 | cfqg_stats_update_group_wait_time(stats); |
586 | } | 586 | } |