On Tue, Mar 2, 2010 at 3:47 PM, Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx> wrote: > * Andrea Righi <arighi@xxxxxxxxxxx> [2010-03-01 22:23:40]: > >> Apply the cgroup dirty pages accounting and limiting infrastructure to >> the opportune kernel functions. >> >> Signed-off-by: Andrea Righi <arighi@xxxxxxxxxxx> >> --- >> fs/fuse/file.c | 5 +++ >> fs/nfs/write.c | 4 ++ >> fs/nilfs2/segment.c | 10 +++++- >> mm/filemap.c | 1 + >> mm/page-writeback.c | 84 ++++++++++++++++++++++++++++++++------------------ >> mm/rmap.c | 4 +- >> mm/truncate.c | 2 + >> 7 files changed, 76 insertions(+), 34 deletions(-) >> >> diff --git a/fs/fuse/file.c b/fs/fuse/file.c >> index a9f5e13..dbbdd53 100644 >> --- a/fs/fuse/file.c >> +++ b/fs/fuse/file.c >> @@ -11,6 +11,7 @@ >> #include <linux/pagemap.h> >> #include <linux/slab.h> >> #include <linux/kernel.h> >> +#include <linux/memcontrol.h> >> #include <linux/sched.h> >> #include <linux/module.h> >> >> @@ -1129,6 +1130,8 @@ static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req) >> >> list_del(&req->writepages_entry); >> dec_bdi_stat(bdi, BDI_WRITEBACK); >> + mem_cgroup_update_stat(req->pages[0], >> + MEM_CGROUP_STAT_WRITEBACK_TEMP, -1); >> dec_zone_page_state(req->pages[0], NR_WRITEBACK_TEMP); >> bdi_writeout_inc(bdi); >> wake_up(&fi->page_waitq); >> @@ -1240,6 +1243,8 @@ static int fuse_writepage_locked(struct page *page) >> req->inode = inode; >> >> inc_bdi_stat(mapping->backing_dev_info, BDI_WRITEBACK); >> + mem_cgroup_update_stat(tmp_page, >> + MEM_CGROUP_STAT_WRITEBACK_TEMP, 1); >> inc_zone_page_state(tmp_page, NR_WRITEBACK_TEMP); >> end_page_writeback(page); >> >> diff --git a/fs/nfs/write.c b/fs/nfs/write.c >> index b753242..7316f7a 100644 >> --- a/fs/nfs/write.c >> +++ b/fs/nfs/write.c > > Don't need memcontrol.h to be included here? It's included in <linux/swap.h> > Looks OK to me overall, but there might be objection using the > mem_cgroup_* naming convention, but I don't mind it very much :) > > -- > Three Cheers, > Balbir > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to majordomo@xxxxxxxxxx For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a> > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href