[PATCH] Exterminate PAGE_BUG

Remove PAGE_BUG - repalce it with BUG and BUG_ON.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5 files changed, 7 insertions, 12 deletions

diff --git a/fs/afs/file.c b/fs/afs/file.c
index 6b6bb7c8ab..23c1251280 100644
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -131,8 +131,7 @@ static int afs_file_readpage(struct file *file, struct page *page)
 
         vnode = AFS_FS_I(inode);
 
-        if (!PageLocked(page))
-                PAGE_BUG(page);
+        BUG_ON(!PageLocked(page));
 
         ret = -ESTALE;
         if (vnode->flags & AFS_VNODE_DELETED)
diff --git a/fs/buffer.c b/fs/buffer.c
index 188365c792..792cbacbbf 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2078,8 +2078,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block)
         int nr, i;
         int fully_mapped = 1;
 
-        if (!PageLocked(page))
-                PAGE_BUG(page);
+        BUG_ON(!PageLocked(page));
         blocksize = 1 << inode->i_blkbits;
         if (!page_has_buffers(page))
                 create_empty_buffers(page, blocksize, 0);
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 0c607c1388..771a554701 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -79,8 +79,7 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)
 
         D2(printk(KERN_DEBUG "jffs2_do_readpage_nolock(): ino #%lu, page at offset 0x%lx\n", inode->i_ino, pg->index << PAGE_CACHE_SHIFT));
 
-        if (!PageLocked(pg))
-                PAGE_BUG(pg);
+        BUG_ON(!PageLocked(pg));
 
         pg_buf = kmap(pg);
         /* FIXME: Can kmap fail? */
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 2faa4172b9..bb40d63f32 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -49,8 +49,7 @@ static int udf_adinicb_readpage(struct file *file, struct page * page)
         struct inode *inode = page->mapping->host;
         char *kaddr;
 
-        if (!PageLocked(page))
-                PAGE_BUG(page);
+        BUG_ON(!PageLocked(page));
 
         kaddr = kmap(page);
         memset(kaddr, 0, PAGE_CACHE_SIZE);
@@ -67,8 +66,7 @@ static int udf_adinicb_writepage(struct page *page, struct writeback_control *wb
         struct inode *inode = page->mapping->host;
         char *kaddr;
 
-        if (!PageLocked(page))
-                PAGE_BUG(page);
+        BUG_ON(!PageLocked(page));
 
         kaddr = kmap(page);
         memcpy(UDF_I_DATA(inode) + UDF_I_LENEATTR(inode), kaddr, inode->i_size);
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 0506e11737..3d68de39fa 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -167,8 +167,8 @@ 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);
+        BUG_ON(!PageLocked(page));
+
         if (!PageUptodate(page))
         {
                 kaddr = kmap(page);