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

Commit cd7619d6 authored by Matt Mackall's avatar Matt Mackall Committed by Linus Torvalds
Browse files

[PATCH] Exterminate PAGE_BUG 



Remove PAGE_BUG - repalce it with BUG and BUG_ON.

Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c8538a7a

arch/arm26/mm/small_page.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -92,8 +92,7 @@ static unsigned long __get_small_page(int priority, struct order *order) 
		page = list_entry(order->queue.next, struct page, lru);

		page = list_entry(order->queue.next, struct page, lru);

again:

again:

#ifdef PEDANTIC

#ifdef PEDANTIC

		if (USED_MAP(page) & ~order->all_used)

		BUG_ON(USED_MAP(page) & ~order->all_used);

			PAGE_BUG(page);

#endif

#endif

		offset = ffz(USED_MAP(page));

		offset = ffz(USED_MAP(page));

		SET_USED(page, offset);

		SET_USED(page, offset);
@@ -141,8 +140,7 @@ static void __free_small_page(unsigned long spage, struct order *order) 
			goto non_small;

			goto non_small;





#ifdef PEDANTIC

#ifdef PEDANTIC

		if (USED_MAP(page) & ~order->all_used)

		BUG_ON(USED_MAP(page) & ~order->all_used);

			PAGE_BUG(page);

#endif

#endif





		spage = spage >> order->shift;

		spage = spage >> order->shift;

fs/afs/file.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -131,8 +131,7 @@ static int afs_file_readpage(struct file *file, struct page *page) 




	vnode = AFS_FS_I(inode);

	vnode = AFS_FS_I(inode);





	if (!PageLocked(page))

	BUG_ON(!PageLocked(page));

		PAGE_BUG(page);





	ret = -ESTALE;

	ret = -ESTALE;

	if (vnode->flags & AFS_VNODE_DELETED)

	if (vnode->flags & AFS_VNODE_DELETED)

fs/buffer.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2078,8 +2078,7 @@ int block_read_full_page(struct page *page, get_block_t *get_block) 
	int nr, i;

	int nr, i;

	int fully_mapped = 1;

	int fully_mapped = 1;





	if (!PageLocked(page))

	BUG_ON(!PageLocked(page));

		PAGE_BUG(page);

	blocksize = 1 << inode->i_blkbits;

	blocksize = 1 << inode->i_blkbits;

	if (!page_has_buffers(page))

	if (!page_has_buffers(page))

		create_empty_buffers(page, blocksize, 0);

		create_empty_buffers(page, blocksize, 0);

fs/jffs2/file.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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));

	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))

	BUG_ON(!PageLocked(pg));

                PAGE_BUG(pg);





	pg_buf = kmap(pg);

	pg_buf = kmap(pg);

	/* FIXME: Can kmap fail? */

	/* FIXME: Can kmap fail? */

fs/udf/file.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -49,8 +49,7 @@ static int udf_adinicb_readpage(struct file *file, struct page * page) 
	struct inode *inode = page->mapping->host;

	struct inode *inode = page->mapping->host;

	char *kaddr;

	char *kaddr;





	if (!PageLocked(page))

	BUG_ON(!PageLocked(page));

		PAGE_BUG(page);





	kaddr = kmap(page);

	kaddr = kmap(page);

	memset(kaddr, 0, PAGE_CACHE_SIZE);

	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;

	struct inode *inode = page->mapping->host;

	char *kaddr;

	char *kaddr;





	if (!PageLocked(page))

	BUG_ON(!PageLocked(page));

		PAGE_BUG(page);





	kaddr = kmap(page);

	kaddr = kmap(page);

	memcpy(UDF_I_DATA(inode) + UDF_I_LENEATTR(inode), kaddr, inode->i_size);

	memcpy(UDF_I_DATA(inode) + UDF_I_LENEATTR(inode), kaddr, inode->i_size);