[PATCH] cleanup page flags

page->flags cleanup.

Moves the definitions of the page->flags bits and all the PageFoo
macros into linux/page-flags.h.  That file is currently included from
mm.h, but the stage is set to remove that and include page-flags.h
direct in all .c files which require that.  (120 of them).

The patch also makes all the page flag macros and functions consistent:

For PG_foo, the following functions are defined:

	SetPageFoo
	ClearPageFoo
	TestSetPageFoo
	TestClearPageFoo
	PageFoo

and that's it.

- Page_Uptodate is renamed to PageUptodate

- LockPage is removed.  All users updated to use SetPageLocked

- UnlockPage is removed.  All callers updated to use unlock_page().
  it's a real function - there's no need to hide that fact.

- PageTestandClearReferenced renamed to TestClearPageReferenced

- PageSetSlab renamed to SetPageSlab

- __SetPageReserved is removed.  It's an infinitesimally small
   microoptimisation, and is inconsistent.

- TryLockPage is renamed to TestSetPageLocked

- PageSwapCache() is renamed to page_swap_cache(), so it doesn't
  pretend to be a page->flags bit test.

44 files changed, 150 insertions, 150 deletions

diff --git a/fs/affs/file.c b/fs/affs/file.c
index 465d34cede28..31bea7c2297e 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -618,7 +618,7 @@ affs_readpage_ofs(struct file *file, struct page *page)
 	err = affs_do_readpage_ofs(file, page, 0, to);
 	if (!err)
 		SetPageUptodate(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return err;
 }
 
@@ -630,7 +630,7 @@ static int affs_prepare_write_ofs(struct file *file, struct page *page, unsigned
 	int err = 0;
 
 	pr_debug("AFFS: prepare_write(%u, %ld, %d, %d)\n", (u32)inode->i_ino, page->index, from, to);
-	if (Page_Uptodate(page))
+	if (PageUptodate(page))
 		return 0;
 
 	size = inode->i_size;
@@ -830,7 +830,7 @@ affs_truncate(struct inode *inode)
 		res = mapping->a_ops->prepare_write(NULL, page, size, size);
 		if (!res)
 			res = mapping->a_ops->commit_write(NULL, page, size, size);
-		UnlockPage(page);
+		unlock_page(page);
 		page_cache_release(page);
 		mark_inode_dirty(inode);
 		unlock_kernel();
diff --git a/fs/affs/symlink.c b/fs/affs/symlink.c
index b4c2e20e07e1..29f42c0e8aa2 100644
--- a/fs/affs/symlink.c
+++ b/fs/affs/symlink.c
@@ -67,12 +67,12 @@ static int affs_symlink_readpage(struct file *file, struct page *page)
 	unlock_kernel();
 	SetPageUptodate(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 fail:
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return err;
 }
 
diff --git a/fs/buffer.c b/fs/buffer.c
index 942a8b853b78..fd4393201bd0 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -552,7 +552,7 @@ static void end_buffer_io_async(struct buffer_head *bh, int uptodate)
 	 */
 	if (page_uptodate && !PageError(page))
 		SetPageUptodate(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return;
 
 still_busy:
@@ -804,7 +804,7 @@ init_page_buffers(struct page *page, struct block_device *bdev,
 	unsigned int b_state;
 
 	b_state = 1 << BH_Mapped;
-	if (Page_Uptodate(page))
+	if (PageUptodate(page))
 		b_state |= 1 << BH_Uptodate;
 
 	do {
@@ -867,7 +867,7 @@ grow_dev_page(struct block_device *bdev, unsigned long block,
 
 failed:
 	buffer_error();
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 	return NULL;
 }
@@ -906,7 +906,7 @@ grow_buffers(struct block_device *bdev, unsigned long block, int size)
 	page = grow_dev_page(bdev, block, index, size);
 	if (!page)
 		return 0;
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 	return 1;
 }
@@ -1253,7 +1253,7 @@ static int __block_write_full_page(struct inode *inode,
 	if (!page_has_buffers(page)) {
 		if (S_ISBLK(inode->i_mode))
 			buffer_error();
-		if (!Page_Uptodate(page))
+		if (!PageUptodate(page))
 			buffer_error();
 		create_empty_buffers(page, 1 << inode->i_blkbits,
 					(1 << BH_Dirty)|(1 << BH_Uptodate));
@@ -1346,7 +1346,7 @@ done:
 		} while (bh != head);
 		if (uptodate)
 			SetPageUptodate(page);
-		UnlockPage(page);
+		unlock_page(page);
 	}
 	return err;
 recover:
@@ -1411,7 +1411,7 @@ static int __block_prepare_write(struct inode *inode, struct page *page,
 	    block++, block_start=block_end, bh = bh->b_this_page) {
 		block_end = block_start + blocksize;
 		if (block_end <= from || block_start >= to) {
-			if (Page_Uptodate(page))
+			if (PageUptodate(page))
 				mark_buffer_uptodate(bh, 1);
 			continue;
 		}
@@ -1423,7 +1423,7 @@ static int __block_prepare_write(struct inode *inode, struct page *page,
 			if (buffer_new(bh)) {
 				clear_bit(BH_New, &bh->b_state);
 				unmap_underlying_metadata(bh);
-				if (Page_Uptodate(page)) {
+				if (PageUptodate(page)) {
 					if (!buffer_mapped(bh))
 						buffer_error();
 					mark_buffer_uptodate(bh, 1);
@@ -1439,7 +1439,7 @@ static int __block_prepare_write(struct inode *inode, struct page *page,
 				continue;
 			}
 		}
-		if (Page_Uptodate(page)) {
+		if (PageUptodate(page)) {
 			mark_buffer_uptodate(bh, 1);
 			continue; 
 		}
@@ -1541,7 +1541,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block)
 
 	if (!PageLocked(page))
 		PAGE_BUG(page);
-	if (Page_Uptodate(page))
+	if (PageUptodate(page))
 		buffer_error();
 	blocksize = 1 << inode->i_blkbits;
 	if (!page_has_buffers(page))
@@ -1588,7 +1588,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block)
 		 */
 		if (!PageError(page))
 			SetPageUptodate(page);
-		UnlockPage(page);
+		unlock_page(page);
 		return 0;
 	}
 
@@ -1656,7 +1656,7 @@ int generic_cont_expand(struct inode *inode, loff_t size)
 	if (!err) {
 		err = mapping->a_ops->commit_write(NULL, page, offset, offset);
 	}
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 	if (err > 0)
 		err = 0;
@@ -1688,7 +1688,7 @@ int cont_prepare_write(struct page *page, unsigned offset,
 			goto out;
 		/* we might sleep */
 		if (*bytes>>PAGE_CACHE_SHIFT != pgpos) {
-			UnlockPage(new_page);
+			unlock_page(new_page);
 			page_cache_release(new_page);
 			continue;
 		}
@@ -1707,7 +1707,7 @@ int cont_prepare_write(struct page *page, unsigned offset,
 		__block_commit_write(inode, new_page,
 				zerofrom, PAGE_CACHE_SIZE);
 		kunmap(new_page);
-		UnlockPage(new_page);
+		unlock_page(new_page);
 		page_cache_release(new_page);
 	}
 
@@ -1746,7 +1746,7 @@ out1:
 out_unmap:
 	ClearPageUptodate(new_page);
 	kunmap(new_page);
-	UnlockPage(new_page);
+	unlock_page(new_page);
 	page_cache_release(new_page);
 out:
 	return status;
@@ -1836,7 +1836,7 @@ int block_truncate_page(struct address_space *mapping,
 	}
 
 	/* Ok, it's mapped. Make sure it's up-to-date */
-	if (Page_Uptodate(page))
+	if (PageUptodate(page))
 		mark_buffer_uptodate(bh, 1);
 
 	if (!buffer_uptodate(bh)) {
@@ -1856,7 +1856,7 @@ int block_truncate_page(struct address_space *mapping,
 	err = 0;
 
 unlock:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 out:
 	return err;
@@ -1879,7 +1879,7 @@ int block_write_full_page(struct page *page, get_block_t *get_block)
 	/* Is the page fully outside i_size? (truncate in progress) */
 	offset = inode->i_size & (PAGE_CACHE_SIZE-1);
 	if (page->index >= end_index+1 || !offset) {
-		UnlockPage(page);
+		unlock_page(page);
 		return -EIO;
 	}
 
@@ -2119,7 +2119,7 @@ int block_symlink(struct inode *inode, const char *symname, int len)
 	mark_inode_dirty(inode);
 	return 0;
 fail_map:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 fail:
 	return err;
@@ -2131,7 +2131,7 @@ fail:
 static void check_ttfb_buffer(struct page *page, struct buffer_head *bh)
 {
 	if (!buffer_uptodate(bh)) {
-		if (Page_Uptodate(page) && page->mapping
+		if (PageUptodate(page) && page->mapping
 			&& buffer_mapped(bh)	/* discard_buffer */
 			&& S_ISBLK(page->mapping->host->i_mode))
 		{
@@ -2190,7 +2190,7 @@ static /*inline*/ int drop_buffers(struct page *page)
 		bh = bh->b_this_page;
 	} while (bh != head);
 
-	if (!was_uptodate && Page_Uptodate(page))
+	if (!was_uptodate && PageUptodate(page))
 		buffer_error();
 
 	do {
diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c
index 15dc80abfbe7..eed35ddd28a1 100644
--- a/fs/coda/symlink.c
+++ b/fs/coda/symlink.c
@@ -40,13 +40,13 @@ static int coda_symlink_filler(struct file *file, struct page *page)
 		goto fail;
 	SetPageUptodate(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 
 fail:
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return error;
 }
 
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index e896adad28ec..b363263644ea 100644
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -425,7 +425,7 @@ static int cramfs_readpage(struct file *file, struct page * page)
 	kunmap(page);
 	flush_dcache_page(page);
 	SetPageUptodate(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 }
 
diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c
index 5dd10f50edb0..d775c01a68d5 100644
--- a/fs/efs/symlink.c
+++ b/fs/efs/symlink.c
@@ -42,13 +42,13 @@ static int efs_symlink_readpage(struct file *file, struct page *page)
 	unlock_kernel();
 	SetPageUptodate(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 fail:
 	unlock_kernel();
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return err;
 }
 
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index 247cdca60ba6..a07034d360c1 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -166,7 +166,7 @@ static struct page * ext2_get_page(struct inode *dir, unsigned long n)
 	if (!IS_ERR(page)) {
 		wait_on_page(page);
 		kmap(page);
-		if (!Page_Uptodate(page))
+		if (!PageUptodate(page))
 			goto fail;
 		if (!PageChecked(page))
 			ext2_check_page(page);
@@ -417,7 +417,7 @@ void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
 	de->inode = cpu_to_le32(inode->i_ino);
 	ext2_set_de_type (de, inode);
 	err = ext2_commit_chunk(page, from, to);
-	UnlockPage(page);
+	unlock_page(page);
 	ext2_put_page(page);
 	dir->i_mtime = dir->i_ctime = CURRENT_TIME;
 	mark_inode_dirty(dir);
@@ -512,7 +512,7 @@ got_it:
 	mark_inode_dirty(dir);
 	/* OFFSET_CACHE */
 out_unlock:
-	UnlockPage(page);
+	unlock_page(page);
 	ext2_put_page(page);
 out:
 	return err;
@@ -553,7 +553,7 @@ int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
 		pde->rec_len = cpu_to_le16(to-from);
 	dir->inode = 0;
 	err = ext2_commit_chunk(page, from, to);
-	UnlockPage(page);
+	unlock_page(page);
 	inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 	mark_inode_dirty(inode);
 out:
@@ -597,7 +597,7 @@ int ext2_make_empty(struct inode *inode, struct inode *parent)
 
 	err = ext2_commit_chunk(page, 0, chunk_size);
 fail:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 	return err;
 }
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 3240e12e4011..309d42c002e6 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1291,7 +1291,7 @@ static int ext3_writepage(struct page *page)
 	/* bget() all the buffers */
 	if (order_data) {
 		if (!page_has_buffers(page)) {
-			if (!Page_Uptodate(page))
+			if (!PageUptodate(page))
 				buffer_error();
 			create_empty_buffers(page,
 				inode->i_sb->s_blocksize,
@@ -1332,7 +1332,7 @@ out_fail:
 	
 	unlock_kernel();
 	SetPageDirty(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return ret;
 }
 
@@ -1422,7 +1422,7 @@ static int ext3_block_truncate_page(handle_t *handle,
 	}
 
 	/* Ok, it's mapped. Make sure it's up-to-date */
-	if (Page_Uptodate(page))
+	if (PageUptodate(page))
 		set_bit(BH_Uptodate, &bh->b_state);
 
 	if (!buffer_uptodate(bh)) {
@@ -1457,7 +1457,7 @@ static int ext3_block_truncate_page(handle_t *handle,
 	}
 
 unlock:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 out:
 	return err;
diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c
index a13e2605b6c4..c076c9cf78f9 100644
--- a/fs/freevxfs/vxfs_immed.c
+++ b/fs/freevxfs/vxfs_immed.c
@@ -132,7 +132,7 @@ vxfs_immed_readpage(struct file *fp, struct page *pp)
 	
 	flush_dcache_page(pp);
 	SetPageUptodate(pp);
-        UnlockPage(pp);
+        unlock_page(pp);
 
 	return 0;
 }
diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c
index 0b1a480e50a5..ebd26eb22069 100644
--- a/fs/freevxfs/vxfs_subr.c
+++ b/fs/freevxfs/vxfs_subr.c
@@ -73,7 +73,7 @@ vxfs_get_page(struct address_space *mapping, u_long n)
 	if (!IS_ERR(pp)) {
 		wait_on_page(pp);
 		kmap(pp);
-		if (!Page_Uptodate(pp))
+		if (!PageUptodate(pp))
 			goto fail;
 		/** if (!PageChecked(pp)) **/
 			/** vxfs_check_page(pp); **/
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index cacd39cac765..85ddc8aef4a6 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -448,14 +448,14 @@ int hpfs_symlink_readpage(struct file *file, struct page *page)
 	unlock_kernel();
 	SetPageUptodate(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 
 fail:
 	unlock_kernel();
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return err;
 }
 	
diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c
index 8a0e9b08663e..4ce2fb2a5f96 100644
--- a/fs/isofs/compress.c
+++ b/fs/isofs/compress.c
@@ -164,7 +164,7 @@ static int zisofs_readpage(struct file *file, struct page *page)
 				flush_dcache_page(page);
 				SetPageUptodate(page);
 				kunmap(page);
-				UnlockPage(page);
+				unlock_page(page);
 				if ( fpage == xpage )
 					err = 0; /* The critical page */
 				else
@@ -282,7 +282,7 @@ static int zisofs_readpage(struct file *file, struct page *page)
 					flush_dcache_page(page);
 					SetPageUptodate(page);
 					kunmap(page);
-					UnlockPage(page);
+					unlock_page(page);
 					if ( fpage == xpage )
 						err = 0; /* The critical page */
 					else
@@ -313,7 +313,7 @@ eio:
 			if ( fpage == xpage )
 				SetPageError(page);
 			kunmap(page);
-			UnlockPage(page);
+			unlock_page(page);
 			if ( fpage != xpage )
 				page_cache_release(page);
 		}
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
index 17b2bb5e6908..8513cf1156c1 100644
--- a/fs/isofs/rock.c
+++ b/fs/isofs/rock.c
@@ -566,7 +566,7 @@ static int rock_ridge_symlink_readpage(struct file *file, struct page *page)
 	unlock_kernel();
 	SetPageUptodate(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 
 	/* error exit from macro */
@@ -584,7 +584,7 @@ static int rock_ridge_symlink_readpage(struct file *file, struct page *page)
 	unlock_kernel();
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return -EIO;
 }
 
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c
index 4bfad318374a..05c8a549fc54 100644
--- a/fs/jffs/inode-v23.c
+++ b/fs/jffs/inode-v23.c
@@ -739,7 +739,7 @@ jffs_do_readpage_nolock(struct file *file, struct page *page)
 		  (f->name ? f->name : ""), (long)page->index));
 
 	get_page(page);
-	/* Don't LockPage(page), should be locked already */
+	/* Don't SetPageLocked(page), should be locked already */
 	buf = page_address(page);
 	ClearPageUptodate(page);
 	ClearPageError(page);
@@ -789,7 +789,7 @@ jffs_do_readpage_nolock(struct file *file, struct page *page)
 static int jffs_readpage(struct file *file, struct page *page)
 {
 	int ret = jffs_do_readpage_nolock(file, page);
-	UnlockPage(page);
+	unlock_page(page);
 	return ret;
 }
 
@@ -1519,7 +1519,7 @@ jffs_prepare_write(struct file *filp, struct page *page,
 	/* FIXME: we should detect some error conditions here */
 
 	/* Bugger that. We should make sure the page is uptodate */
-	if (!Page_Uptodate(page) && (from || to < PAGE_CACHE_SIZE))
+	if (!PageUptodate(page) && (from || to < PAGE_CACHE_SIZE))
 		return jffs_do_readpage_nolock(filp, page);
 
 	return 0;
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 97677034592f..96064cdffd83 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -281,7 +281,7 @@ int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)
 int jffs2_do_readpage_unlock(struct inode *inode, struct page *pg)
 {
 	int ret = jffs2_do_readpage_nolock(inode, pg);
-	UnlockPage(pg);
+	unlock_page(pg);
 	return ret;
 }
 
@@ -371,7 +371,7 @@ int jffs2_prepare_write (struct file *filp, struct page *pg, unsigned start, uns
 	
 
 	/* Read in the page if it wasn't already present */
-	if (!Page_Uptodate(pg) && (start || end < PAGE_SIZE))
+	if (!PageUptodate(pg) && (start || end < PAGE_SIZE))
 		ret = jffs2_do_readpage_nolock(inode, pg);
 	D1(printk(KERN_DEBUG "end prepare_write()\n"));
 	up(&f->sem);
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 31ed1c238af1..b0f57ed0f963 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -494,7 +494,7 @@ static inline void sync_metapage(metapage_t *mp)
 		waitfor_one_page(page);
 	}
 
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 }
 
@@ -527,7 +527,7 @@ void release_metapage(metapage_t * mp)
 			mp->data = 0;
 			if (test_bit(META_dirty, &mp->flag))
 				__write_metapage(mp);
-			UnlockPage(mp->page);
+			unlock_page(mp->page);
 			if (test_bit(META_sync, &mp->flag)) {
 				sync_metapage(mp);
 				clear_bit(META_sync, &mp->flag);
@@ -536,7 +536,7 @@ void release_metapage(metapage_t * mp)
 			if (test_bit(META_discard, &mp->flag)) {
 				lock_page(mp->page);
 				block_flushpage(mp->page, 0);
-				UnlockPage(mp->page);
+				unlock_page(mp->page);
 			}
 
 			page_cache_release(mp->page);
@@ -593,7 +593,7 @@ void invalidate_metapages(struct inode *ip, unsigned long addr,
 			page = find_lock_page(mapping, lblock>>l2BlocksPerPage);
 			if (page) {
 				block_flushpage(page, 0);
-				UnlockPage(page);
+				unlock_page(page);
 			}
 		}
 	}
@@ -610,7 +610,7 @@ void invalidate_inode_metapages(struct inode *inode)
 		clear_bit(META_dirty, &mp->flag);
 		set_bit(META_discard, &mp->flag);
 		kunmap(mp->page);
-		UnlockPage(mp->page);
+		unlock_page(mp->page);
 		page_cache_release(mp->page);
 		INCREMENT(mpStat.pagefree);
 		mp->data = 0;
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index a89969d8371d..57b286dc7f46 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -66,7 +66,7 @@ static struct page * dir_get_page(struct inode *dir, unsigned long n)
 	if (!IS_ERR(page)) {
 		wait_on_page(page);
 		kmap(page);
-		if (!Page_Uptodate(page))
+		if (!PageUptodate(page))
 			goto fail;
 	}
 	return page;
@@ -269,7 +269,7 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
 		de->inode = 0;
 		err = dir_commit_chunk(page, from, to);
 	}
-	UnlockPage(page);
+	unlock_page(page);
 	dir_put_page(page);
 	inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 	mark_inode_dirty(inode);
@@ -303,7 +303,7 @@ int minix_make_empty(struct inode *inode, struct inode *dir)
 
 	err = dir_commit_chunk(page, 0, 2 * sbi->s_dirsize);
 fail:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 	return err;
 }
@@ -369,7 +369,7 @@ void minix_set_link(struct minix_dir_entry *de, struct page *page,
 		de->inode = inode->i_ino;
 		err = dir_commit_chunk(page, from, to);
 	}
-	UnlockPage(page);
+	unlock_page(page);
 	dir_put_page(page);
 	dir->i_mtime = dir->i_ctime = CURRENT_TIME;
 	mark_inode_dirty(dir);
diff --git a/fs/namei.c b/fs/namei.c
index fe1789235584..111e110f9990 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2098,7 +2098,7 @@ static char *page_getlink(struct dentry * dentry, struct page **ppage)
 	if (IS_ERR(page))
 		goto sync_fail;
 	wait_on_page(page);
-	if (!Page_Uptodate(page))
+	if (!PageUptodate(page))
 		goto async_fail;
 	*ppage = page;
 	return kmap(page);
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index feb133caae26..cfaade2f5ffc 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -430,7 +430,7 @@ static int ncp_readdir(struct file *filp, void *dirent, filldir_t filldir)
 	ctl.cache = cache = kmap(page);
 	ctl.head  = cache->head;
 
-	if (!Page_Uptodate(page) || !ctl.head.eof)
+	if (!PageUptodate(page) || !ctl.head.eof)
 		goto init_cache;
 
 	if (filp->f_pos == 2) {
@@ -456,7 +456,7 @@ static int ncp_readdir(struct file *filp, void *dirent, filldir_t filldir)
 			if (!ctl.page)
 				goto invalid_cache;
 			ctl.cache = kmap(ctl.page);
-			if (!Page_Uptodate(ctl.page))
+			if (!PageUptodate(ctl.page))
 				goto invalid_cache;
 		}
 		while (ctl.idx < NCP_DIRCACHE_SIZE) {
@@ -481,7 +481,7 @@ static int ncp_readdir(struct file *filp, void *dirent, filldir_t filldir)
 		if (ctl.page) {
 			kunmap(ctl.page);
 			SetPageUptodate(ctl.page);
-			UnlockPage(ctl.page);
+			unlock_page(ctl.page);
 			page_cache_release(ctl.page);
 			ctl.page = NULL;
 		}
@@ -491,7 +491,7 @@ static int ncp_readdir(struct file *filp, void *dirent, filldir_t filldir)
 invalid_cache:
 	if (ctl.page) {
 		kunmap(ctl.page);
-		UnlockPage(ctl.page);
+		unlock_page(ctl.page);
 		page_cache_release(ctl.page);
 		ctl.page = NULL;
 	}
@@ -523,13 +523,13 @@ finished:
 		cache->head = ctl.head;
 		kunmap(page);
 		SetPageUptodate(page);
-		UnlockPage(page);
+		unlock_page(page);
 		page_cache_release(page);
 	}
 	if (ctl.page) {
 		kunmap(ctl.page);
 		SetPageUptodate(ctl.page);
-		UnlockPage(ctl.page);
+		unlock_page(ctl.page);
 		page_cache_release(ctl.page);
 	}
 out:
@@ -597,7 +597,7 @@ ncp_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
 		if (ctl.page) {
 			kunmap(ctl.page);
 			SetPageUptodate(ctl.page);
-			UnlockPage(ctl.page);
+			unlock_page(ctl.page);
 			page_cache_release(ctl.page);
 		}
 		ctl.cache = NULL;
diff --git a/fs/ncpfs/symlink.c b/fs/ncpfs/symlink.c
index 044fe0f73ea8..fe3f9bef2691 100644
--- a/fs/ncpfs/symlink.c
+++ b/fs/ncpfs/symlink.c
@@ -81,7 +81,7 @@ static int ncp_symlink_readpage(struct file *file, struct page *page)
 		goto fail;
 	SetPageUptodate(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 
 failEIO:
@@ -90,7 +90,7 @@ failEIO:
 fail:
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return error;
 }
 
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 4ce6cee33d1c..0ead2158d647 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -123,12 +123,12 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)
 	 */
 	if (page->index == 0)
 		invalidate_inode_pages(inode);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
  error:
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	invalidate_inode_pages(inode);
 	desc->error = error;
 	return -EIO;
@@ -202,7 +202,7 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)
 		status = PTR_ERR(page);
 		goto out;
 	}
-	if (!Page_Uptodate(page))
+	if (!PageUptodate(page))
 		goto read_error;
 
 	/* NOTE: Someone else may have changed the READDIRPLUS flag */
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index f85bec8c32b5..54e730744c60 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -145,7 +145,7 @@ nfs_readpage_sync(struct file *file, struct inode *inode, struct page *page)
 
 io_error:
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return result;
 }
 
@@ -226,7 +226,7 @@ nfs_async_read_error(struct list_head *head)
 		page = req->wb_page;
 		nfs_list_remove_request(req);
 		SetPageError(page);
-		UnlockPage(page);
+		unlock_page(page);
 		nfs_clear_request(req);
 		nfs_release_request(req);
 		nfs_unlock_request(req);
@@ -430,7 +430,7 @@ nfs_readpage_result(struct rpc_task *task)
 			SetPageError(page);
 		flush_dcache_page(page);
 		kunmap(page);
-		UnlockPage(page);
+		unlock_page(page);
 
 		dprintk("NFS: read (%s/%Ld %d@%Ld)\n",
                         req->wb_inode->i_sb->s_id,
@@ -483,7 +483,7 @@ out:
 	return error;
 
 out_error:
-	UnlockPage(page);
+	unlock_page(page);
 	goto out;
 }
 
diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c
index 82203f1b2490..2c6e1ded5afe 100644
--- a/fs/nfs/symlink.c
+++ b/fs/nfs/symlink.c
@@ -44,13 +44,13 @@ static int nfs_symlink_filler(struct inode *inode, struct page *page)
 		goto error;
 	SetPageUptodate(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 
 error:
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return -EIO;
 }
 
@@ -64,7 +64,7 @@ static char *nfs_getlink(struct inode *inode, struct page **ppage)
 				(filler_t *)nfs_symlink_filler, inode);
 	if (IS_ERR(page))
 		goto read_failed;
-	if (!Page_Uptodate(page))
+	if (!PageUptodate(page))
 		goto getlink_read_error;
 	*ppage = page;
 	p = kmap(page);
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 8a61ceaaf3f1..6b667c22133c 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -272,7 +272,7 @@ do_it:
 	}
 	unlock_kernel();
 out:
-	UnlockPage(page);
+	unlock_page(page);
 	return err; 
 }
 
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 339fbc0969e4..d6b44161ea67 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -89,7 +89,7 @@ static void end_buffer_read_file_async(struct buffer_head *bh, int uptodate)
 	spin_unlock_irqrestore(&page_uptodate_lock, flags);
 	if (!PageError(page))
 		SetPageUptodate(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return;
 still_busy:
 	spin_unlock_irqrestore(&page_uptodate_lock, flags);
@@ -227,7 +227,7 @@ handle_zblock:
 		SetPageUptodate(page);
 	else /* Signal synchronous i/o error. */
 		nr = -EIO;
-	UnlockPage(page);
+	unlock_page(page);
 	return nr;
 }
 
@@ -329,7 +329,7 @@ put_unm_unl_err_out:
 unm_unl_err_out:
 	unmap_mft_record(READ, ni);
 unl_err_out:
-	UnlockPage(page);
+	unlock_page(page);
 	return err;
 }
 
@@ -388,7 +388,7 @@ static void end_buffer_read_mftbmp_async(struct buffer_head *bh, int uptodate)
 	spin_unlock_irqrestore(&page_uptodate_lock, flags);
 	if (!PageError(page))
 		SetPageUptodate(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return;
 still_busy:
 	spin_unlock_irqrestore(&page_uptodate_lock, flags);
@@ -507,7 +507,7 @@ handle_zblock:
 		SetPageUptodate(page);
 	else /* Signal synchronous i/o error. */
 		nr = -EIO;
-	UnlockPage(page);
+	unlock_page(page);
 	return nr;
 }
 
@@ -613,7 +613,7 @@ static void end_buffer_read_mst_async(struct buffer_head *bh, int uptodate)
 			SetPageError(page);
 		}
 	}
-	UnlockPage(page);
+	unlock_page(page);
 	return;
 still_busy:
 	spin_unlock_irqrestore(&page_uptodate_lock, flags);
@@ -761,7 +761,7 @@ handle_zblock:
 		SetPageUptodate(page);
 	else /* Signal synchronous i/o error. */
 		nr = -EIO;
-	UnlockPage(page);
+	unlock_page(page);
 	return nr;
 }
 
diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c
index 2a98ac3cfca7..b2fd83191a44 100644
--- a/fs/ntfs/compress.c
+++ b/fs/ntfs/compress.c
@@ -198,7 +198,7 @@ return_error:
 			flush_dcache_page(dp);
 			kunmap(dp);
 			SetPageUptodate(dp);
-			UnlockPage(dp);
+			unlock_page(dp);
 			if (di == xpage)
 				*xpage_done = 1;
 			else
@@ -491,7 +491,7 @@ int ntfs_file_read_compressed_block(struct page *page)
 		kfree(bhs);
 		kfree(pages);
 		SetPageError(page);
-		UnlockPage(page);
+		unlock_page(page);
 		ntfs_error(vol->sb, "Failed to allocate internal buffers.");
 		return -ENOMEM;
 	}
@@ -521,13 +521,13 @@ int ntfs_file_read_compressed_block(struct page *page)
 			 * in and/or dirty or we would be losing data or at
 			 * least wasting our time.
 			 */
-			if (!PageDirty(page) && (!Page_Uptodate(page) ||
+			if (!PageDirty(page) && (!PageUptodate(page) ||
 					PageError(page))) {
 				ClearPageError(page);
 				kmap(page);
 				continue;
 			}
-			UnlockPage(page);
+			unlock_page(page);
 			page_cache_release(page);
 			pages[i] = NULL;
 		}
@@ -668,7 +668,7 @@ retry_remap:
 				flush_dcache_page(page);
 				kunmap(page);
 				SetPageUptodate(page);
-				UnlockPage(page);
+				unlock_page(page);
 				if (cur_page == xpage)
 					xpage_done = 1;
 				else
@@ -738,7 +738,7 @@ retry_remap:
 				flush_dcache_page(page);
 				kunmap(page);
 				SetPageUptodate(page);
-				UnlockPage(page);
+				unlock_page(page);
 				if (cur2_page == xpage)
 					xpage_done = 1;
 				else
@@ -775,7 +775,7 @@ retry_remap:
 						SetPageError(page);
 					flush_dcache_page(page);
 					kunmap(page);
-					UnlockPage(page);
+					unlock_page(page);
 					if (prev_cur_page != xpage)
 						page_cache_release(page);
 					pages[prev_cur_page] = NULL;
@@ -806,7 +806,7 @@ retry_remap:
 				SetPageError(page);
 			flush_dcache_page(page);
 			kunmap(page);
-			UnlockPage(page);
+			unlock_page(page);
 			if (cur_page != xpage)
 				page_cache_release(page);
 			pages[cur_page] = NULL;
@@ -853,7 +853,7 @@ err_out:
 				SetPageError(page);
 			flush_dcache_page(page);
 			kunmap(page);
-			UnlockPage(page);
+			unlock_page(page);
 			if (i != xpage)
 				page_cache_release(page);
 		}
diff --git a/fs/ntfs/ntfs.h b/fs/ntfs/ntfs.h
index fff7d8357847..de5a04967f61 100644
--- a/fs/ntfs/ntfs.h
+++ b/fs/ntfs/ntfs.h
@@ -190,7 +190,7 @@ static inline struct page *ntfs_map_page(struct address_space *mapping,
 	if (!IS_ERR(page)) {
 		wait_on_page(page);
 		kmap(page);
-		if (Page_Uptodate(page) && !PageError(page))
+		if (PageUptodate(page) && !PageError(page))
 			return page;
 		ntfs_unmap_page(page);
 		return ERR_PTR(-EIO);
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index c7acc41aa346..bbff13e0ea05 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -1215,7 +1215,7 @@ handle_partial_page:
 			continue;
 		}
 		wait_on_page(page);
-		if (!Page_Uptodate(page)) {
+		if (!PageUptodate(page)) {
 			ntfs_debug("Async read_cache_page() error. Skipping "
 					"page (index 0x%lx).", index - 1);
 			/* Ignore pages which errored asynchronously. */
@@ -1298,7 +1298,7 @@ handle_partial_page:
 			continue;
 		}
 		wait_on_page(page);
-		if (!Page_Uptodate(page)) {
+		if (!PageUptodate(page)) {
 			ntfs_debug("Async read_cache_page() error. Skipping "
 					"page (index 0x%lx).", index - 1);
 			/* Ignore pages which errored asynchronously. */
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 003f996f6a2f..1bb7d3273716 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -433,7 +433,7 @@ unsigned char *read_dev_sector(struct block_device *bdev, unsigned long n, Secto
 			(filler_t *)mapping->a_ops->readpage, NULL);
 	if (!IS_ERR(page)) {
 		wait_on_page(page);
-		if (!Page_Uptodate(page))
+		if (!PageUptodate(page))
 			goto fail;
 		if (PageError(page))
 			goto fail;
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index b1e23193f8f0..6d31e937127e 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -47,20 +47,20 @@ static struct inode_operations ramfs_dir_inode_operations;
  */
 static int ramfs_readpage(struct file *file, struct page * page)
 {
-	if (!Page_Uptodate(page)) {
+	if (!PageUptodate(page)) {
 		memset(kmap(page), 0, PAGE_CACHE_SIZE);
 		kunmap(page);
 		flush_dcache_page(page);
 		SetPageUptodate(page);
 	}
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 }
 
 static int ramfs_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
 {
 	void *addr = kmap(page);
-	if (!Page_Uptodate(page)) {
+	if (!PageUptodate(page)) {
 		memset(addr, 0, PAGE_CACHE_SIZE);
 		flush_dcache_page(page);
 		SetPageUptodate(page);
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 27d4c44648a5..e6c6bae2123f 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -273,7 +273,7 @@ research:
             kunmap(bh_result->b_page) ;
 	// We do not return -ENOENT if there is a hole but page is uptodate, because it means
 	// That there is some MMAPED data associated with it that is yet to be written to disk.
-	if ((args & GET_BLOCK_NO_HOLE) && !Page_Uptodate(bh_result->b_page) ) {
+	if ((args & GET_BLOCK_NO_HOLE) && !PageUptodate(bh_result->b_page) ) {
 	    return -ENOENT ;
 	}
         return 0 ;
@@ -295,7 +295,7 @@ research:
 	} else 
 	    // We do not return -ENOENT if there is a hole but page is uptodate, because it means
 	    // That there is some MMAPED data associated with it that is yet to  be written to disk.
-	    if ((args & GET_BLOCK_NO_HOLE) && !Page_Uptodate(bh_result->b_page) ) {
+	    if ((args & GET_BLOCK_NO_HOLE) && !PageUptodate(bh_result->b_page) ) {
 	    ret = -ENOENT ;
 	    }
 
@@ -328,7 +328,7 @@ research:
 	** read old data off disk.  Set the up to date bit on the buffer instead
 	** and jump to the end
 	*/
-	    if (Page_Uptodate(bh_result->b_page)) {
+	    if (PageUptodate(bh_result->b_page)) {
 		mark_buffer_uptodate(bh_result, 1);
 		goto finished ;
     }
@@ -500,7 +500,7 @@ static int convert_tail_for_hole(struct inode *inode,
 
 unlock:
     if (tail_page != hole_page) {
-        UnlockPage(tail_page) ;
+        unlock_page(tail_page) ;
 	page_cache_release(tail_page) ;
     }
 out:
@@ -1722,7 +1722,7 @@ out:
     return error ;
 
 unlock:
-    UnlockPage(page) ;
+    unlock_page(page) ;
     page_cache_release(page) ;
     return error ;
 }
@@ -1794,7 +1794,7 @@ void reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps) {
 	        mark_buffer_dirty(bh) ;
 	    }
 	}
-	UnlockPage(page) ;
+	unlock_page(page) ;
 	page_cache_release(page) ;
     }
 
@@ -1996,7 +1996,7 @@ static int reiserfs_write_full_page(struct page *page) {
     if (nr) {
         submit_bh_for_writepage(arr, nr) ;
     } else {
-        UnlockPage(page) ;
+        unlock_page(page) ;
     }
     if (!partial)
         SetPageUptodate(page) ;
@@ -2007,7 +2007,7 @@ fail:
     if (nr) {
         submit_bh_for_writepage(arr, nr) ;
     } else {
-        UnlockPage(page) ;
+        unlock_page(page) ;
     }
     ClearPageUptodate(page) ;
     return error ;
diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index a3c2d858dec0..ef41742ba491 100644
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
@@ -83,7 +83,7 @@ int reiserfs_unpack (struct inode * inode, struct file * filp)
     kunmap(page) ; /* mapped by prepare_write */
 
 out_unlock:
-    UnlockPage(page) ;
+    unlock_page(page) ;
     page_cache_release(page) ;
 
 out:
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c
index 68f8fc24abc9..bd7a3e85520e 100644
--- a/fs/reiserfs/tail_conversion.c
+++ b/fs/reiserfs/tail_conversion.c
@@ -106,7 +106,7 @@ int direct2indirect (struct reiserfs_transaction_handle *th, struct inode * inod
 	** this avoids overwriting good data from writepage() with old data
 	** from the disk or buffer cache
 	*/
-	if (buffer_uptodate(unbh) || Page_Uptodate(unbh->b_page)) {
+	if (buffer_uptodate(unbh) || PageUptodate(unbh->b_page)) {
 	    up_to_date_bh = NULL ;
 	} else {
 	    up_to_date_bh = unbh ;
diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c
index b833c8532163..369e2cfd50a1 100644
--- a/fs/romfs/inode.c
+++ b/fs/romfs/inode.c
@@ -432,7 +432,7 @@ romfs_readpage(struct file *file, struct page * page)
 	}
 	flush_dcache_page(page);
 
-	UnlockPage(page);
+	unlock_page(page);
 
 	kunmap(page);
 err_out:
diff --git a/fs/smbfs/cache.c b/fs/smbfs/cache.c
index 20ba2c24aef6..687027deea73 100644
--- a/fs/smbfs/cache.c
+++ b/fs/smbfs/cache.c
@@ -37,7 +37,7 @@ smb_invalid_dir_cache(struct inode * dir)
 	if (!page)
 		goto out;
 
-	if (!Page_Uptodate(page))
+	if (!PageUptodate(page))
 		goto out_unlock;
 
 	cache = kmap(page);
@@ -46,7 +46,7 @@ smb_invalid_dir_cache(struct inode * dir)
 	kunmap(page);
 	SetPageUptodate(page);
 out_unlock:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 out:
 	return;
@@ -172,7 +172,7 @@ smb_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
 		if (ctl.page) {
 			kunmap(ctl.page);
 			SetPageUptodate(ctl.page);
-			UnlockPage(ctl.page);
+			unlock_page(ctl.page);
 			page_cache_release(ctl.page);
 		}
 		ctl.cache = NULL;
diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
index 897fdbeee1de..3c1385af23e0 100644
--- a/fs/smbfs/dir.c
+++ b/fs/smbfs/dir.c
@@ -102,9 +102,9 @@ smb_readdir(struct file *filp, void *dirent, filldir_t filldir)
 	ctl.cache = cache = kmap(page);
 	ctl.head  = cache->head;
 
-	if (!Page_Uptodate(page) || !ctl.head.eof) {
+	if (!PageUptodate(page) || !ctl.head.eof) {
 		VERBOSE("%s/%s, page uptodate=%d, eof=%d\n",
-			 DENTRY_PATH(dentry), Page_Uptodate(page),ctl.head.eof);
+			 DENTRY_PATH(dentry), PageUptodate(page),ctl.head.eof);
 		goto init_cache;
 	}
 
@@ -136,7 +136,7 @@ smb_readdir(struct file *filp, void *dirent, filldir_t filldir)
 			if (!ctl.page)
 				goto invalid_cache;
 			ctl.cache = kmap(ctl.page);
-			if (!Page_Uptodate(ctl.page))
+			if (!PageUptodate(ctl.page))
 				goto invalid_cache;
 		}
 		while (ctl.idx < SMB_DIRCACHE_SIZE) {
@@ -162,7 +162,7 @@ smb_readdir(struct file *filp, void *dirent, filldir_t filldir)
 		if (ctl.page) {
 			kunmap(ctl.page);
 			SetPageUptodate(ctl.page);
-			UnlockPage(ctl.page);
+			unlock_page(ctl.page);
 			page_cache_release(ctl.page);
 			ctl.page = NULL;
 		}
@@ -172,7 +172,7 @@ smb_readdir(struct file *filp, void *dirent, filldir_t filldir)
 invalid_cache:
 	if (ctl.page) {
 		kunmap(ctl.page);
-		UnlockPage(ctl.page);
+		unlock_page(ctl.page);
 		page_cache_release(ctl.page);
 		ctl.page = NULL;
 	}
@@ -197,13 +197,13 @@ finished:
 		cache->head = ctl.head;
 		kunmap(page);
 		SetPageUptodate(page);
-		UnlockPage(page);
+		unlock_page(page);
 		page_cache_release(page);
 	}
 	if (ctl.page) {
 		kunmap(ctl.page);
 		SetPageUptodate(ctl.page);
-		UnlockPage(ctl.page);
+		unlock_page(ctl.page);
 		page_cache_release(ctl.page);
 	}
 out:
diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c
index 4bc482e14031..464041dd271b 100644
--- a/fs/smbfs/file.c
+++ b/fs/smbfs/file.c
@@ -94,7 +94,7 @@ smb_readpage_sync(struct dentry *dentry, struct page *page)
 
 io_error:
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return result;
 }
 
@@ -199,7 +199,7 @@ do_it:
 	get_page(page);
 	err = smb_writepage_sync(inode, page, 0, offset);
 	SetPageUptodate(page);
-	UnlockPage(page);
+	unlock_page(page);
 	put_page(page);
 	return err;
 }
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index 41e13fe81c8b..b02acc93d686 100644
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -60,7 +60,7 @@ static struct page * dir_get_page(struct inode *dir, unsigned long n)
 	if (!IS_ERR(page)) {
 		wait_on_page(page);
 		kmap(page);
-		if (!Page_Uptodate(page))
+		if (!PageUptodate(page))
 			goto fail;
 	}
 	return page;
@@ -233,7 +233,7 @@ got_it:
 	dir->i_mtime = dir->i_ctime = CURRENT_TIME;
 	mark_inode_dirty(dir);
 out_unlock:
-	UnlockPage(page);
+	unlock_page(page);
 out_page:
 	dir_put_page(page);
 out:
@@ -255,7 +255,7 @@ int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page)
 		BUG();
 	de->inode = 0;
 	err = dir_commit_chunk(page, from, to);
-	UnlockPage(page);
+	unlock_page(page);
 	dir_put_page(page);
 	inode->i_ctime = inode->i_mtime = CURRENT_TIME;
 	mark_inode_dirty(inode);
@@ -288,7 +288,7 @@ int sysv_make_empty(struct inode *inode, struct inode *dir)
 
 	err = dir_commit_chunk(page, 0, 2 * SYSV_DIRSIZE);
 fail:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 	return err;
 }
@@ -352,7 +352,7 @@ void sysv_set_link(struct sysv_dir_entry *de, struct page *page,
 		BUG();
 	de->inode = cpu_to_fs16(inode->i_sb, inode->i_ino);
 	err = dir_commit_chunk(page, from, to);
-	UnlockPage(page);
+	unlock_page(page);
 	dir_put_page(page);
 	dir->i_mtime = dir->i_ctime = CURRENT_TIME;
 	mark_inode_dirty(dir);
diff --git a/fs/udf/file.c b/fs/udf/file.c
index bba20e6f6d50..30e38892a753 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -71,7 +71,7 @@ static int udf_adinicb_readpage(struct file *file, struct page * page)
 	SetPageUptodate(page);
 out:
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return err;
 }
 
@@ -102,7 +102,7 @@ static int udf_adinicb_writepage(struct page *page)
 	SetPageUptodate(page);
 out:
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return err;
 }
 
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 114883363612..485af6c62395 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -186,7 +186,7 @@ void udf_expand_file_adinicb(struct inode * inode, int newsize, int * err)
 	page = grab_cache_page(inode->i_mapping, 0);
 	if (!PageLocked(page))
 		PAGE_BUG(page);
-	if (!Page_Uptodate(page))
+	if (!PageUptodate(page))
 	{
 		kaddr = kmap(page);
 		memset(kaddr + UDF_I_LENALLOC(inode), 0x00,
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index c9c5154af588..dc6317f426a1 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -111,13 +111,13 @@ static int udf_symlink_filler(struct file *file, struct page *page)
 	unlock_kernel();
 	SetPageUptodate(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return 0;
 out:
 	unlock_kernel();
 	SetPageError(page);
 	kunmap(page);
-	UnlockPage(page);
+	unlock_page(page);
 	return err;
 }
 
diff --git a/fs/umsdos/dir.c b/fs/umsdos/dir.c
index 4586fc6841e0..d9710923d0ba 100644
--- a/fs/umsdos/dir.c
+++ b/fs/umsdos/dir.c
@@ -693,7 +693,7 @@ struct dentry *umsdos_solve_hlink (struct dentry *hlink)
 	if (IS_ERR(page))
 		goto out;
 	wait_on_page(page);
-	if (!Page_Uptodate(page))
+	if (!PageUptodate(page))
 		goto async_fail;
 
 	dentry_dst = ERR_PTR(-ENOMEM);
diff --git a/fs/umsdos/emd.c b/fs/umsdos/emd.c
index 2b64394eba7c..3ea53f89999a 100644
--- a/fs/umsdos/emd.c
+++ b/fs/umsdos/emd.c
@@ -140,7 +140,7 @@ int umsdos_emd_dir_readentry (struct dentry *demd, loff_t *pos, struct umsdos_di
 	if (IS_ERR(page))
 		goto sync_fail;
 	wait_on_page(page);
-	if (!Page_Uptodate(page))
+	if (!PageUptodate(page))
 		goto async_fail;
 	p = (struct umsdos_dirent*)(kmap(page)+offs);
 
@@ -166,7 +166,7 @@ int umsdos_emd_dir_readentry (struct dentry *demd, loff_t *pos, struct umsdos_di
 			goto sync_fail;
 		}
 		wait_on_page(page2);
-		if (!Page_Uptodate(page2)) {
+		if (!PageUptodate(page2)) {
 			kunmap(page);
 			page_cache_release(page2);
 			goto async_fail;
@@ -276,7 +276,7 @@ int umsdos_writeentry (struct dentry *parent, struct umsdos_info *info,
 			goto out_unlock3;
 		ret = mapping->a_ops->commit_write(NULL,page,offs,
 					PAGE_CACHE_SIZE);
-		UnlockPage(page2);
+		unlock_page(page2);
 		page_cache_release(page2);
 		if (ret)
 			goto out_unlock;
@@ -292,7 +292,7 @@ int umsdos_writeentry (struct dentry *parent, struct umsdos_info *info,
 		if (ret)
 			goto out_unlock;
 	}
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 		
 	dir->i_ctime = dir->i_mtime = CURRENT_TIME;
@@ -304,13 +304,13 @@ out:
 	Printk (("umsdos_writeentry /mn/: returning %d...\n", ret));
 	return ret;
 out_unlock3:
-	UnlockPage(page2);
+	unlock_page(page2);
 	page_cache_release(page2);
 out_unlock2:
 	ClearPageUptodate(page);
 	kunmap(page);
 out_unlock:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 	printk ("UMSDOS:  problem with EMD file:  can't write\n");
 	goto out_dput;
@@ -393,7 +393,7 @@ static int umsdos_find (struct dentry *demd, struct umsdos_info *info)
 			if (IS_ERR(page))
 				goto sync_fail;
 			wait_on_page(page);
-			if (!Page_Uptodate(page))
+			if (!PageUptodate(page))
 				goto async_fail;
 			p = kmap(page);
 		}
@@ -442,7 +442,7 @@ static int umsdos_find (struct dentry *demd, struct umsdos_info *info)
 				goto sync_fail;
 			}
 			wait_on_page(next_page);
-			if (!Page_Uptodate(next_page)) {
+			if (!PageUptodate(next_page)) {
 				page_cache_release(page);
 				page = next_page;
 				goto async_fail;
diff --git a/fs/umsdos/inode.c b/fs/umsdos/inode.c
index 79b5bb2eacda..93a33d8d881d 100644
--- a/fs/umsdos/inode.c
+++ b/fs/umsdos/inode.c
@@ -300,7 +300,7 @@ dentry->d_parent->d_name.name, dentry->d_name.name, UMSDOS_I(inode)->i_patched))
 	 * EMD file. The msdos fs is not even called.
 	 */
 out_unlock:
-	UnlockPage(page);
+	unlock_page(page);
 	page_cache_release(page);
 out_dput:
 	dput(demd);