Rename bdi_setpoint and bdi_dirty in the tracepoint to wb_setpoint and wb_dirty, respectively. These changes were omitted by Tejun in the cgroup writeback patchset.
Unified · Split
| @@ -646,8 +646,8 @@ TRACE_EVENT(balance_dirty_pages, · 645 unmodified lines | ||
| 646 | 646 | __field(unsigned long, limit) |
| 647 | 647 | __field(unsigned long, setpoint) |
| 648 | 648 | __field(unsigned long, dirty) |
| 649 | − __field(unsigned long, bdi_setpoint) | |
| 650 | − __field(unsigned long, bdi_dirty) | |
| 649 | + __field(unsigned long, wb_setpoint) | |
| 650 | + __field(unsigned long, wb_dirty) | |
| 651 | 651 | __field(unsigned long, dirty_ratelimit) |
| 652 | 652 | __field(unsigned long, task_ratelimit) |
| 653 | 653 | __field(unsigned int, dirtied) |
| @@ -667,9 +667,9 @@ TRACE_EVENT(balance_dirty_pages, · 13 unmodified lines | ||
| 667 | 667 | __entry->setpoint = (global_wb_domain.dirty_limit + |
| 668 | 668 | freerun) / 2; |
| 669 | 669 | __entry->dirty = dtc->dirty; |
| 670 | − __entry->bdi_setpoint = __entry->setpoint * | |
| 670 | + __entry->wb_setpoint = __entry->setpoint * | |
| 671 | 671 | dtc->wb_thresh / (dtc->thresh + 1); |
| 672 | − __entry->bdi_dirty = dtc->wb_dirty; | |
| 672 | + __entry->wb_dirty = dtc->wb_dirty; | |
| 673 | 673 | __entry->dirty_ratelimit = KBps(dirty_ratelimit); |
| 674 | 674 | __entry->task_ratelimit = KBps(task_ratelimit); |
| 675 | 675 | __entry->dirtied = dirtied; |
| @@ -685,7 +685,7 @@ TRACE_EVENT(balance_dirty_pages, · 9 unmodified lines | ||
| 685 | 685 | |
| 686 | 686 | TP_printk("bdi %s: " |
| 687 | 687 | "limit=%lu setpoint=%lu dirty=%lu " |
| 688 | − "bdi_setpoint=%lu bdi_dirty=%lu " | |
| 688 | + "wb_setpoint=%lu wb_dirty=%lu " | |
| 689 | 689 | "dirty_ratelimit=%lu task_ratelimit=%lu " |
| 690 | 690 | "dirtied=%u dirtied_pause=%u " |
| 691 | 691 | "paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%lu", |
| @@ -693,8 +693,8 @@ TRACE_EVENT(balance_dirty_pages, · 1 unmodified line | ||
| 693 | 693 | __entry->limit, |
| 694 | 694 | __entry->setpoint, |
| 695 | 695 | __entry->dirty, |
| 696 | − __entry->bdi_setpoint, | |
| 697 | − __entry->bdi_dirty, | |
| 696 | + __entry->wb_setpoint, | |
| 697 | + __entry->wb_dirty, | |
| 698 | 698 | __entry->dirty_ratelimit, |
| 699 | 699 | __entry->task_ratelimit, |
| 700 | 700 | __entry->dirtied, |