| Message ID | 1511385366-20329-6-git-send-email-josef@toxicpanda.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed 22-11-17 16:16:00, Josef Bacik wrote: > From: Josef Bacik <jbacik@fb.com> > > The flexible proportions were all page based, but now that we are doing > metadata writeout that can be smaller or larger than page size we need > to account for this in bytes instead of number of pages. > > Signed-off-by: Josef Bacik <jbacik@fb.com> Looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > mm/page-writeback.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > index e4563645749a..2a1994194cc1 100644 > --- a/mm/page-writeback.c > +++ b/mm/page-writeback.c > @@ -574,11 +574,11 @@ static unsigned long wp_next_time(unsigned long cur_time) > return cur_time; > } > > -static void wb_domain_writeout_inc(struct wb_domain *dom, > +static void wb_domain_writeout_add(struct wb_domain *dom, > struct fprop_local_percpu *completions, > - unsigned int max_prop_frac) > + long bytes, unsigned int max_prop_frac) > { > - __fprop_inc_percpu_max(&dom->completions, completions, > + __fprop_add_percpu_max(&dom->completions, completions, bytes, > max_prop_frac); > /* First event after period switching was turned off? */ > if (unlikely(!dom->period_time)) { > @@ -602,12 +602,12 @@ static inline void __wb_writeout_add(struct bdi_writeback *wb, long bytes) > struct wb_domain *cgdom; > > __add_wb_stat(wb, WB_WRITTEN_BYTES, bytes); > - wb_domain_writeout_inc(&global_wb_domain, &wb->completions, > + wb_domain_writeout_add(&global_wb_domain, &wb->completions, bytes, > wb->bdi->max_prop_frac); > > cgdom = mem_cgroup_wb_domain(wb); > if (cgdom) > - wb_domain_writeout_inc(cgdom, wb_memcg_completions(wb), > + wb_domain_writeout_add(cgdom, wb_memcg_completions(wb), bytes, > wb->bdi->max_prop_frac); > } > > -- > 2.7.5 >
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e4563645749a..2a1994194cc1 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -574,11 +574,11 @@ static unsigned long wp_next_time(unsigned long cur_time) return cur_time; } -static void wb_domain_writeout_inc(struct wb_domain *dom, +static void wb_domain_writeout_add(struct wb_domain *dom, struct fprop_local_percpu *completions, - unsigned int max_prop_frac) + long bytes, unsigned int max_prop_frac) { - __fprop_inc_percpu_max(&dom->completions, completions, + __fprop_add_percpu_max(&dom->completions, completions, bytes, max_prop_frac); /* First event after period switching was turned off? */ if (unlikely(!dom->period_time)) { @@ -602,12 +602,12 @@ static inline void __wb_writeout_add(struct bdi_writeback *wb, long bytes) struct wb_domain *cgdom; __add_wb_stat(wb, WB_WRITTEN_BYTES, bytes); - wb_domain_writeout_inc(&global_wb_domain, &wb->completions, + wb_domain_writeout_add(&global_wb_domain, &wb->completions, bytes, wb->bdi->max_prop_frac); cgdom = mem_cgroup_wb_domain(wb); if (cgdom) - wb_domain_writeout_inc(cgdom, wb_memcg_completions(wb), + wb_domain_writeout_add(cgdom, wb_memcg_completions(wb), bytes, wb->bdi->max_prop_frac); }