From: Andrew Morton Signed-off-by: Andrew Morton --- fs/reiser4/flush_queue.c | 2 +- fs/reiser4/jnode.c | 10 +++++----- fs/reiser4/page_cache.c | 2 +- fs/reiser4/page_cache.h | 2 +- fs/reiser4/plugin/file/tail_conversion.c | 2 +- fs/reiser4/txnmgr.c | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff -puN fs/reiser4/jnode.c~reiser4-page-private-fixes fs/reiser4/jnode.c --- devel/fs/reiser4/jnode.c~reiser4-page-private-fixes 2005-10-23 18:18:40.000000000 -0700 +++ devel-akpm/fs/reiser4/jnode.c 2005-10-23 19:00:05.000000000 -0700 @@ -38,12 +38,12 @@ * page_address(). * * jnode and page are attached to each other by jnode_attach_page(). This - * function places pointer to jnode in page->private, sets PG_private flag + * function places pointer to jnode in page_private(), sets PG_private flag * and increments page counter. * * Opposite operation is performed by page_clear_jnode(). * - * jnode->pg is protected by jnode spin lock, and page->private is + * jnode->pg is protected by jnode spin lock, and page_private() is * protected by page lock. See comment at the top of page_cache.c for * more. * @@ -666,7 +666,7 @@ void jnode_attach_page(jnode * node, str assert("nikita-2060", node != NULL); assert("nikita-2061", pg != NULL); - assert("nikita-2050", pg->private == 0ul); + assert("nikita-2050", page_private(pg) == 0ul); assert("nikita-2393", !PagePrivate(pg)); assert("vs-1741", node->pg == NULL); @@ -674,7 +674,7 @@ void jnode_attach_page(jnode * node, str assert("nikita-2397", spin_jnode_is_locked(node)); page_cache_get(pg); - pg->private = (unsigned long)node; + set_page_private(pg, (unsigned long)node); node->pg = pg; SetPagePrivate(pg); } @@ -691,7 +691,7 @@ void page_clear_jnode(struct page *page, assert("nikita-3551", !PageWriteback(page)); JF_CLR(node, JNODE_PARSED); - page->private = 0ul; + set_page_private(page, 0ul); ClearPagePrivate(page); node->pg = NULL; page_cache_release(page); diff -puN fs/reiser4/page_cache.h~reiser4-page-private-fixes fs/reiser4/page_cache.h --- devel/fs/reiser4/page_cache.h~reiser4-page-private-fixes 2005-10-23 18:18:40.000000000 -0700 +++ devel-akpm/fs/reiser4/page_cache.h 2005-10-23 18:18:40.000000000 -0700 @@ -30,7 +30,7 @@ static inline void lock_and_wait_page_wr reiser4_wait_page_writeback(page); } -#define jprivate(page) ((jnode *) (page)->private) +#define jprivate(page) ((jnode *) page_private(page)) extern int page_io(struct page *page, jnode * node, int rw, int gfp); extern void drop_page(struct page *page); diff -puN fs/reiser4/txnmgr.c~reiser4-page-private-fixes fs/reiser4/txnmgr.c --- devel/fs/reiser4/txnmgr.c~reiser4-page-private-fixes 2005-10-23 18:18:40.000000000 -0700 +++ devel-akpm/fs/reiser4/txnmgr.c 2005-10-23 19:00:05.000000000 -0700 @@ -2342,7 +2342,7 @@ void uncapture_page(struct page *pg) reiser4_wait_page_writeback(pg); - node = (jnode *) (pg->private); + node = jprivate(pg); BUG_ON(node == NULL); LOCK_JNODE(node); @@ -3634,14 +3634,14 @@ static void swap_jnode_pages(jnode * nod copy->pg = node->pg; copy->data = page_address(copy->pg); jnode_set_block(copy, jnode_get_block(node)); - copy->pg->private = (unsigned long)copy; + set_page_private(copy->pg, (unsigned long)copy); /* attach new page to jnode */ assert("vs-1412", !PagePrivate(new_page)); page_cache_get(new_page); node->pg = new_page; node->data = page_address(new_page); - new_page->private = (unsigned long)node; + set_page_private(new_page, (unsigned long)node); SetPagePrivate(new_page); { diff -puN fs/reiser4/page_cache.c~reiser4-page-private-fixes fs/reiser4/page_cache.c --- devel/fs/reiser4/page_cache.c~reiser4-page-private-fixes 2005-10-23 18:34:21.000000000 -0700 +++ devel-akpm/fs/reiser4/page_cache.c 2005-10-23 18:34:40.000000000 -0700 @@ -753,7 +753,7 @@ void print_page(const char *prefix, stru } printk("%s: page index: %lu mapping: %p count: %i private: %lx\n", prefix, page->index, page->mapping, page_count(page), - page->private); + page_private(page)); printk("\tflags: %s%s%s%s %s%s%s %s%s%s %s%s\n", page_flag_name(page, PG_locked), page_flag_name(page, PG_error), page_flag_name(page, PG_referenced), page_flag_name(page, diff -puN fs/reiser4/flush_queue.c~reiser4-page-private-fixes fs/reiser4/flush_queue.c --- devel/fs/reiser4/flush_queue.c~reiser4-page-private-fixes 2005-10-23 18:42:42.000000000 -0700 +++ devel-akpm/fs/reiser4/flush_queue.c 2005-10-23 19:00:05.000000000 -0700 @@ -435,7 +435,7 @@ end_io_handler(struct bio *bio, unsigned assert("zam-736", pg != NULL); assert("zam-736", PagePrivate(pg)); - node = (jnode *) (pg->private); + node = jprivate(pg); JF_CLR(node, JNODE_WRITEBACK); } diff -puN fs/reiser4/plugin/file/tail_conversion.c~reiser4-page-private-fixes fs/reiser4/plugin/file/tail_conversion.c --- devel/fs/reiser4/plugin/file/tail_conversion.c~reiser4-page-private-fixes 2005-10-23 19:00:10.000000000 -0700 +++ devel-akpm/fs/reiser4/plugin/file/tail_conversion.c 2005-10-23 19:00:30.000000000 -0700 @@ -670,7 +670,7 @@ int extent2tail(unix_file_info_t * uf_in /* page is already detached from jnode and mapping. */ assert("vs-1086", page->mapping == NULL); assert("nikita-2690", - (!PagePrivate(page) && page->private == 0)); + (!PagePrivate(page) && page_private(page) == 0)); /* waiting for writeback completion with page lock held is * perfectly valid. */ wait_on_page_writeback(page); _