tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Matt Mackall and committed by
Linus Torvalds cd7619d6 c8538a7a

+10 -37
+2 -4
arch/arm26/mm/small_page.c
··· 92 92 page = list_entry(order->queue.next, struct page, lru); 93 93 again: 94 94 #ifdef PEDANTIC 95 - if (USED_MAP(page) & ~order->all_used) 96 - PAGE_BUG(page); 95 + BUG_ON(USED_MAP(page) & ~order->all_used); 97 96 #endif 98 97 offset = ffz(USED_MAP(page)); 99 98 SET_USED(page, offset); ··· 140 141 goto non_small; 141 142 142 143 #ifdef PEDANTIC 143 - if (USED_MAP(page) & ~order->all_used) 144 - PAGE_BUG(page); 144 + BUG_ON(USED_MAP(page) & ~order->all_used); 145 145 #endif 146 146 147 147 spage = spage >> order->shift;
+1 -2
fs/afs/file.c
··· 131 131 132 132 vnode = AFS_FS_I(inode); 133 133 134 - if (!PageLocked(page)) 135 - PAGE_BUG(page); 134 + BUG_ON(!PageLocked(page)); 136 135 137 136 ret = -ESTALE; 138 137 if (vnode->flags & AFS_VNODE_DELETED)
+1 -2
fs/buffer.c
··· 2078 2078 int nr, i; 2079 2079 int fully_mapped = 1; 2080 2080 2081 - if (!PageLocked(page)) 2082 - PAGE_BUG(page); 2081 + BUG_ON(!PageLocked(page)); 2083 2082 blocksize = 1 << inode->i_blkbits; 2084 2083 if (!page_has_buffers(page)) 2085 2084 create_empty_buffers(page, blocksize, 0);
+1 -2
fs/jffs2/file.c
··· 79 79 80 80 D2(printk(KERN_DEBUG "jffs2_do_readpage_nolock(): ino #%lu, page at offset 0x%lx\n", inode->i_ino, pg->index << PAGE_CACHE_SHIFT)); 81 81 82 - if (!PageLocked(pg)) 83 - PAGE_BUG(pg); 82 + BUG_ON(!PageLocked(pg)); 84 83 85 84 pg_buf = kmap(pg); 86 85 /* FIXME: Can kmap fail? */
+2 -4
fs/udf/file.c
··· 49 49 struct inode *inode = page->mapping->host; 50 50 char *kaddr; 51 51 52 - if (!PageLocked(page)) 53 - PAGE_BUG(page); 52 + BUG_ON(!PageLocked(page)); 54 53 55 54 kaddr = kmap(page); 56 55 memset(kaddr, 0, PAGE_CACHE_SIZE); ··· 66 67 struct inode *inode = page->mapping->host; 67 68 char *kaddr; 68 69 69 - if (!PageLocked(page)) 70 - PAGE_BUG(page); 70 + BUG_ON(!PageLocked(page)); 71 71 72 72 kaddr = kmap(page); 73 73 memcpy(UDF_I_DATA(inode) + UDF_I_LENEATTR(inode), kaddr, inode->i_size);
+2 -2
fs/udf/inode.c
··· 167 167 } 168 168 169 169 page = grab_cache_page(inode->i_mapping, 0); 170 - if (!PageLocked(page)) 171 - PAGE_BUG(page); 170 + BUG_ON(!PageLocked(page)); 171 + 172 172 if (!PageUptodate(page)) 173 173 { 174 174 kaddr = kmap(page);
-4
include/asm-cris/page.h
··· 77 77 printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ 78 78 } while (0) 79 79 80 - #define PAGE_BUG(page) do { \ 81 - BUG(); \ 82 - } while (0) 83 - 84 80 /* Pure 2^n version of get_order */ 85 81 static inline int get_order(unsigned long size) 86 82 {
-11
include/asm-generic/bug.h
··· 12 12 } while (0) 13 13 #endif 14 14 15 - #ifndef HAVE_ARCH_PAGE_BUG 16 - #define PAGE_BUG(page) do { \ 17 - printk("page BUG for page at %p\n", page); \ 18 - BUG(); \ 19 - } while (0) 20 - #endif 21 - 22 15 #ifndef HAVE_ARCH_BUG_ON 23 16 #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0) 24 17 #endif ··· 28 35 #else /* !CONFIG_BUG */ 29 36 #ifndef HAVE_ARCH_BUG 30 37 #define BUG() 31 - #endif 32 - 33 - #ifndef HAVE_ARCH_PAGE_BUG 34 - #define PAGE_BUG(page) do { if (page) ; } while (0) 35 38 #endif 36 39 37 40 #ifndef HAVE_ARCH_BUG_ON
-4
include/asm-sh64/bug.h
··· 17 17 BUG(); \ 18 18 } while(0) 19 19 20 - #define PAGE_BUG(page) do { \ 21 - BUG(); \ 22 - } while (0) 23 - 24 20 #define WARN_ON(condition) do { \ 25 21 if (unlikely((condition)!=0)) { \ 26 22 printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
+1 -2
mm/filemap.c
··· 123 123 { 124 124 struct address_space *mapping = page->mapping; 125 125 126 - if (unlikely(!PageLocked(page))) 127 - PAGE_BUG(page); 126 + BUG_ON(!PageLocked(page)); 128 127 129 128 write_lock_irq(&mapping->tree_lock); 130 129 __remove_from_page_cache(page);