Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 836cb711 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

Revert update for dirty_ratio for memcg. 



The flags added by commit db16d5ec
has no user now. We believe we'll use it soon but considering
patch reviewing, the change itself should be folded into incoming
set of "dirty ratio for memcg" patches.

So, it's better to drop this change from current mainline tree.

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: default avatarGreg Thelen <gthelen@google.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 11ff26c8

include/linux/page_cgroup.h

+0 −23
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ enum { 
	/* flags for mem_cgroup and file and I/O status */

	PCG_MOVE_LOCK, /* For race between move_account v.s. following bits */

	PCG_FILE_MAPPED, /* page is accounted as "mapped" */

	PCG_FILE_DIRTY, /* page is dirty */

	PCG_FILE_WRITEBACK, /* page is under writeback */

	PCG_FILE_UNSTABLE_NFS, /* page is NFS unstable */

	/* No lock in page_cgroup */

	PCG_ACCT_LRU, /* page has been accounted for (under lru_lock) */

};
@@ -65,10 +62,6 @@ static inline void ClearPageCgroup##uname(struct page_cgroup *pc) \ 
static inline int TestClearPageCgroup##uname(struct page_cgroup *pc)	\

	{ return test_and_clear_bit(PCG_##lname, &pc->flags);  }



#define TESTSETPCGFLAG(uname, lname)			\

static inline int TestSetPageCgroup##uname(struct page_cgroup *pc)	\

	{ return test_and_set_bit(PCG_##lname, &pc->flags);  }



/* Cache flag is set only once (at allocation) */

TESTPCGFLAG(Cache, CACHE)

CLEARPCGFLAG(Cache, CACHE)
@@ -88,22 +81,6 @@ SETPCGFLAG(FileMapped, FILE_MAPPED) 
CLEARPCGFLAG(FileMapped, FILE_MAPPED)

TESTPCGFLAG(FileMapped, FILE_MAPPED)



SETPCGFLAG(FileDirty, FILE_DIRTY)

CLEARPCGFLAG(FileDirty, FILE_DIRTY)

TESTPCGFLAG(FileDirty, FILE_DIRTY)

TESTCLEARPCGFLAG(FileDirty, FILE_DIRTY)

TESTSETPCGFLAG(FileDirty, FILE_DIRTY)



SETPCGFLAG(FileWriteback, FILE_WRITEBACK)

CLEARPCGFLAG(FileWriteback, FILE_WRITEBACK)

TESTPCGFLAG(FileWriteback, FILE_WRITEBACK)



SETPCGFLAG(FileUnstableNFS, FILE_UNSTABLE_NFS)

CLEARPCGFLAG(FileUnstableNFS, FILE_UNSTABLE_NFS)

TESTPCGFLAG(FileUnstableNFS, FILE_UNSTABLE_NFS)

TESTCLEARPCGFLAG(FileUnstableNFS, FILE_UNSTABLE_NFS)

TESTSETPCGFLAG(FileUnstableNFS, FILE_UNSTABLE_NFS)



SETPCGFLAG(Migration, MIGRATION)

CLEARPCGFLAG(Migration, MIGRATION)

TESTPCGFLAG(Migration, MIGRATION)