From: Christoph Lameter Subject: Pageflags: Eliminate PG_xxx aliases Remove aliases of PG_xxx. We can easily drop those now and alias by specifying the PG_xxx flag in the macro that generates the functions. Signed-off-by: Christoph Lameter --- include/linux/page-flags.h | 22 +++++++++++++--------- mm/page_alloc.c | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) Index: linux-2.6.25-rc5-mm1/mm/page_alloc.c =================================================================== --- linux-2.6.25-rc5-mm1.orig/mm/page_alloc.c 2008-03-20 12:27:30.956544318 -0700 +++ linux-2.6.25-rc5-mm1/mm/page_alloc.c 2008-03-20 13:00:09.290224787 -0700 @@ -650,7 +650,7 @@ static int prep_new_page(struct page *pa if (PageReserved(page)) return 1; - page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_readahead | + page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_reclaim | 1 << PG_referenced | 1 << PG_arch_1 | 1 << PG_owner_priv_1 | 1 << PG_mappedtodisk); set_page_private(page, 0); Index: linux-2.6.25-rc5-mm1/include/linux/page-flags.h =================================================================== --- linux-2.6.25-rc5-mm1.orig/include/linux/page-flags.h 2008-03-20 13:00:00.506212338 -0700 +++ linux-2.6.25-rc5-mm1/include/linux/page-flags.h 2008-03-20 13:20:19.864241128 -0700 @@ -78,9 +78,13 @@ enum pageflags { PG_lru, PG_active, PG_slab, - PG_owner_priv_1, /* Owner use. If pagecache, fs may use*/ - PG_checked = PG_owner_priv_1, /* Used by some filesystems */ - PG_pinned = PG_owner_priv_1, /* Xen pinned pagetable */ + /* + * PG_owner_priv_1 is for the use of the owner of the page. If this is + * a pagecache page then the filesystem may use the flag. + * Additional sets of page flag functions (PageChecked(), PagePinned()) exist + * that use PG_owner_priv_1. + */ + PG_owner_priv_1, PG_arch_1, PG_reserved, PG_private, /* If pagecache, has fs-private data */ @@ -90,10 +94,10 @@ enum pageflags { PG_mappedtodisk, /* Has blocks allocated on-disk */ PG_reclaim, /* To be reclaimed asap */ /* - * PG_readahead is only used for file reads; - * PG_reclaim is only for writes + * PG_reclaim is used for file writes n xxxPageReclaim(). + * PG_reclaim is also for in xxxPageReadahead() as a reminder that + * read ahead needs to be done. */ - PG_readahead = PG_reclaim, /* Reminder to do async read-ahead */ PG_buddy, /* Page is free, on buddy lists */ #if (BITS_PER_LONG > 32) @@ -161,8 +165,8 @@ PAGEFLAG(Dirty, dirty) TESTSCFLAG(Dirty, PAGEFLAG(LRU, lru) __CLEARPAGEFLAG(LRU, lru) PAGEFLAG(Active, active) __CLEARPAGEFLAG(Active, active) __PAGEFLAG(Slab, slab) -PAGEFLAG(Checked, checked) /* Used by some filesystems */ -PAGEFLAG(Pinned, pinned) TESTSCFLAG(Pinned, pinned) /* Xen pagetable */ +PAGEFLAG(Checked, owner_priv_1) /* Used by some filesystems */ +PAGEFLAG(Pinned, owner_priv_1) TESTSCFLAG(Pinned, owner_priv_1) /* Xen */ PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved) PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private) __SETPAGEFLAG(Private, private) @@ -177,7 +181,7 @@ PAGEFLAG(MappedToDisk, mappedtodisk) /* PG_readahead is only used for file reads; PG_reclaim is only for writes */ PAGEFLAG(Reclaim, reclaim) TESTCLEARFLAG(Reclaim, reclaim) -PAGEFLAG(Readahead, readahead) /* Reminder to do async read-ahead */ +PAGEFLAG(Readahead, reclaim) /* Reminder to do async read-ahead */ #ifdef CONFIG_HIGHMEM /*