--- linux-2.5.33/fs/inode.c.orig Thu Aug 1 14:16:45 2002 +++ linux-2.5.33/fs/inode.c Fri Sep 6 11:25:32 2002 @@ -144,8 +144,7 @@ static void destroy_inode(struct inode *inode) { - if (inode_has_buffers(inode)) - BUG(); + BUG_ON(inode_has_buffers(inode)); security_ops->inode_free_security(inode); if (inode->i_sb->s_op->destroy_inode) inode->i_sb->s_op->destroy_inode(inode); @@ -218,12 +217,9 @@ { invalidate_inode_buffers(inode); - if (inode->i_data.nrpages) - BUG(); - if (!(inode->i_state & I_FREEING)) - BUG(); - if (inode->i_state & I_CLEAR) - BUG(); + BUG_ON(inode->i_data.nrpages); + BUG_ON(!(inode->i_state & I_FREEING)); + BUG_ON(inode->i_state & I_CLEAR); wait_on_inode(inode); DQUOT_DROP(inode); if (inode->i_sb && inode->i_sb->s_op && inode->i_sb->s_op->clear_inode) @@ -813,8 +809,7 @@ delete(inode); } else clear_inode(inode); - if (inode->i_state != I_CLEAR) - BUG(); + BUG_ON(inode->i_state != I_CLEAR); destroy_inode(inode); } EXPORT_SYMBOL(generic_delete_inode); @@ -894,8 +889,7 @@ if (inode) { struct super_operations *op = inode->i_sb->s_op; - if (inode->i_state == I_CLEAR) - BUG(); + BUG_ON(inode->i_state == I_CLEAR); if (op && op->put_inode) op->put_inode(inode); --- linux-2.5.33/fs/dcache.c.orig Thu Aug 1 14:16:08 2002 +++ linux-2.5.33/fs/dcache.c Fri Sep 6 11:25:31 2002 @@ -123,8 +123,8 @@ return; /* dput on a free dentry? */ - if (!list_empty(&dentry->d_lru)) - BUG(); + BUG_ON(!list_empty(&dentry->d_lru)); + /* * AV: ->d_delete() is _NOT_ allowed to block now. */ @@ -349,8 +349,7 @@ dentry_stat.nr_unused--; /* Unused dentry with a count? */ - if (atomic_read(&dentry->d_count)) - BUG(); + BUG_ON(atomic_read(&dentry->d_count)); prune_one_dentry(dentry); if (!--count) @@ -686,7 +685,7 @@ void d_instantiate(struct dentry *entry, struct inode * inode) { - if (!list_empty(&entry->d_alias)) BUG(); + BUG_ON(!list_empty(&entry->d_alias)); spin_lock(&dcache_lock); if (inode) list_add(&entry->d_alias, &inode->i_dentry); @@ -985,7 +984,7 @@ void d_rehash(struct dentry * entry) { struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash); - if (!list_empty(&entry->d_hash)) BUG(); + BUG_ON(!list_empty(&entry->d_hash)); spin_lock(&dcache_lock); list_add(&entry->d_hash, list); spin_unlock(&dcache_lock); --- linux-2.5.33/fs/dquot.c.orig Thu Aug 1 14:16:08 2002 +++ linux-2.5.33/fs/dquot.c Fri Sep 6 11:25:29 2002 @@ -1184,8 +1184,7 @@ dquot_incr_inodes(transfer_to[cnt], 1); dquot_incr_space(transfer_to[cnt], space); - if (inode->i_dquot[cnt] == NODQUOT) - BUG(); + BUG_ON(inode->i_dquot[cnt] == NODQUOT); inode->i_dquot[cnt] = transfer_to[cnt]; /* * We've got to release transfer_from[] twice - once for dquot_transfer() and --- linux-2.5.33/mm/slab.c.orig Thu Aug 1 14:16:33 2002 +++ linux-2.5.33/mm/slab.c Fri Sep 6 11:46:25 2002 @@ -451,8 +451,7 @@ kmem_cache_estimate(0, cache_cache.objsize, 0, &left_over, &cache_cache.num); - if (!cache_cache.num) - BUG(); + BUG_ON(!cache_cache.num); cache_cache.colour = left_over/cache_cache.colour_off; cache_cache.colour_next = 0; @@ -477,12 +476,10 @@ * eliminates "false sharing". * Note for systems short on memory removing the alignment will * allow tighter packing of the smaller caches. */ - if (!(sizes->cs_cachep = + BUG_ON(!(sizes->cs_cachep = kmem_cache_create(cache_names[sizes-cache_sizes].name, - sizes->cs_size, - 0, SLAB_HWCACHE_ALIGN, NULL, NULL))) { - BUG(); - } + sizes->cs_size, + 0, SLAB_HWCACHE_ALIGN, NULL, NULL))); /* Inc off-slab bufctl limit until the ceiling is hit. */ if (!(OFF_SLAB(sizes->cs_cachep))) { @@ -493,8 +490,7 @@ cache_names[sizes-cache_sizes].name_dma, sizes->cs_size, 0, SLAB_CACHE_DMA|SLAB_HWCACHE_ALIGN, NULL, NULL); - if (!sizes->cs_dmacachep) - BUG(); + BUG_ON(!sizes->cs_dmacachep); sizes++; } while (sizes->cs_size); } @@ -593,11 +589,9 @@ void* objp = slabp->s_mem+cachep->objsize*i; #if DEBUG if (cachep->flags & SLAB_RED_ZONE) { - if (*((unsigned long*)(objp)) != RED_MAGIC1) - BUG(); - if (*((unsigned long*)(objp + cachep->objsize - -BYTES_PER_WORD)) != RED_MAGIC1) - BUG(); + BUG_ON(*((unsigned long*)(objp)) != RED_MAGIC1); + BUG_ON(*((unsigned long*)(objp + cachep->objsize + -BYTES_PER_WORD)) != RED_MAGIC1); objp += BYTES_PER_WORD; } #endif @@ -607,9 +601,8 @@ if (cachep->flags & SLAB_RED_ZONE) { objp -= BYTES_PER_WORD; } - if ((cachep->flags & SLAB_POISON) && - kmem_check_poison_obj(cachep, objp)) - BUG(); + BUG_ON((cachep->flags & SLAB_POISON) && + kmem_check_poison_obj(cachep, objp)); #endif } } @@ -664,13 +657,12 @@ /* * Sanity checks... these are all serious usage bugs. */ - if ((!name) || + BUG_ON((!name) || in_interrupt() || (size < BYTES_PER_WORD) || (size > (1< size)) - BUG(); + (offset < 0 || offset > size)); #if DEBUG if ((flags & SLAB_DEBUG_INITIAL) && !ctor) { @@ -700,8 +692,7 @@ * Always checks flags, a caller might be expecting debug * support which isn't available. */ - if (flags & ~CREATE_MASK) - BUG(); + BUG_ON(flags & ~CREATE_MASK); /* Get cache's description obj. */ cachep = (kmem_cache_t *) kmem_cache_alloc(&cache_cache, SLAB_KERNEL); @@ -977,8 +968,7 @@ slabp = list_entry(cachep->slabs_free.prev, slab_t, list); #if DEBUG - if (slabp->inuse) - BUG(); + BUG_ON(slabp->inuse); #endif list_del(&slabp->list); @@ -1000,9 +990,7 @@ */ int kmem_cache_shrink(kmem_cache_t *cachep) { - if (!cachep || in_interrupt() || !is_chained_kmem_cache(cachep)) - BUG(); - + BUG_ON(!cachep || in_interrupt() || !is_chained_kmem_cache(cachep)); return __kmem_cache_shrink(cachep); } @@ -1023,8 +1011,7 @@ */ int kmem_cache_destroy (kmem_cache_t * cachep) { - if (!cachep || in_interrupt() || cachep->growing) - BUG(); + BUG_ON(!cachep || in_interrupt() || cachep->growing); /* Find the cache in the chain of caches. */ down(&cache_chain_sem); @@ -1112,11 +1099,9 @@ /* need to poison the objs */ kmem_poison_obj(cachep, objp); if (cachep->flags & SLAB_RED_ZONE) { - if (*((unsigned long*)(objp)) != RED_MAGIC1) - BUG(); - if (*((unsigned long*)(objp + cachep->objsize - - BYTES_PER_WORD)) != RED_MAGIC1) - BUG(); + BUG_ON(*((unsigned long*)(objp)) != RED_MAGIC1); + BUG_ON(*((unsigned long*)(objp + cachep->objsize - + BYTES_PER_WORD)) != RED_MAGIC1); } #endif slab_bufctl(slabp)[i] = i+1; @@ -1142,8 +1127,7 @@ /* Be lazy and only check for valid flags here, * keeping it out of the critical path in kmem_cache_alloc(). */ - if (flags & ~(SLAB_DMA|SLAB_LEVEL_MASK|SLAB_NO_GROW)) - BUG(); + BUG_ON(flags & ~(SLAB_DMA|SLAB_LEVEL_MASK|SLAB_NO_GROW)); if (flags & SLAB_NO_GROW) return 0; @@ -1153,8 +1137,7 @@ * in kmem_cache_alloc(). If a caller is seriously mis-behaving they * will eventually be caught here (where it matters). */ - if (in_interrupt() && (flags & __GFP_WAIT)) - BUG(); + BUG_ON(in_interrupt() && (flags & __GFP_WAIT)); ctor_flags = SLAB_CTOR_CONSTRUCTOR; local_flags = (flags & SLAB_LEVEL_MASK); @@ -1241,15 +1224,12 @@ int i; unsigned int objnr = (objp-slabp->s_mem)/cachep->objsize; - if (objnr >= cachep->num) - BUG(); - if (objp != slabp->s_mem + objnr*cachep->objsize) - BUG(); + BUG_ON(objnr >= cachep->num); + BUG_ON(objp != slabp->s_mem + objnr*cachep->objsize); /* Check slab's freelist to see if this obj is there. */ for (i = slabp->free; i != BUFCTL_END; i = slab_bufctl(slabp)[i]) { - if (i == objnr) - BUG(); + BUG_ON(i == objnr); } return 0; } @@ -1258,11 +1238,9 @@ static inline void kmem_cache_alloc_head(kmem_cache_t *cachep, int flags) { if (flags & SLAB_DMA) { - if (!(cachep->gfpflags & GFP_DMA)) - BUG(); + BUG_ON(!(cachep->gfpflags & GFP_DMA)); } else { - if (cachep->gfpflags & GFP_DMA) - BUG(); + BUG_ON(cachep->gfpflags & GFP_DMA); } } @@ -1286,16 +1264,13 @@ } #if DEBUG if (cachep->flags & SLAB_POISON) - if (kmem_check_poison_obj(cachep, objp)) - BUG(); + BUG_ON(kmem_check_poison_obj(cachep, objp)); if (cachep->flags & SLAB_RED_ZONE) { /* Set alloc red-zone, and check old one. */ - if (xchg((unsigned long *)objp, RED_MAGIC2) != - RED_MAGIC1) - BUG(); - if (xchg((unsigned long *)(objp+cachep->objsize - - BYTES_PER_WORD), RED_MAGIC2) != RED_MAGIC1) - BUG(); + BUG_ON(xchg((unsigned long *)objp, RED_MAGIC2) != + RED_MAGIC1); + BUG_ON(xchg((unsigned long *)(objp+cachep->objsize - + BYTES_PER_WORD), RED_MAGIC2) != RED_MAGIC1); objp += BYTES_PER_WORD; } #endif @@ -1473,13 +1448,11 @@ if (cachep->flags & SLAB_RED_ZONE) { objp -= BYTES_PER_WORD; - if (xchg((unsigned long *)objp, RED_MAGIC1) != RED_MAGIC2) - /* Either write before start, or a double free. */ - BUG(); - if (xchg((unsigned long *)(objp+cachep->objsize - - BYTES_PER_WORD), RED_MAGIC1) != RED_MAGIC2) - /* Either write past end, or a double free. */ - BUG(); + BUG_ON(xchg((unsigned long *)objp, RED_MAGIC1) != RED_MAGIC2); + /* Either write before start, or a double free. */ + BUG_ON(xchg((unsigned long *)(objp+cachep->objsize - + BYTES_PER_WORD), RED_MAGIC1) != RED_MAGIC2); + /* Either write past end, or a double free. */ } if (cachep->flags & SLAB_POISON) kmem_poison_obj(cachep, objp); @@ -1617,8 +1590,7 @@ unsigned long flags; #if DEBUG CHECK_PAGE(objp); - if (cachep != GET_PAGE_CACHE(virt_to_page(objp))) - BUG(); + BUG_ON(cachep != GET_PAGE_CACHE(virt_to_page(objp))); #endif local_irq_save(flags); @@ -1823,8 +1795,7 @@ while (p != &searchp->slabs_free) { slabp = list_entry(p, slab_t, list); #if DEBUG - if (slabp->inuse) - BUG(); + BUG_ON(slabp->inuse); #endif full_free++; p = p->next; @@ -1876,8 +1847,7 @@ break; slabp = list_entry(p,slab_t,list); #if DEBUG - if (slabp->inuse) - BUG(); + BUG_ON(slabp->inuse); #endif list_del(&slabp->list); STATS_INC_REAPED(best_cachep); @@ -1962,22 +1932,19 @@ num_slabs = 0; list_for_each(q,&cachep->slabs_full) { slabp = list_entry(q, slab_t, list); - if (slabp->inuse != cachep->num) - BUG(); + BUG_ON(slabp->inuse != cachep->num); active_objs += cachep->num; active_slabs++; } list_for_each(q,&cachep->slabs_partial) { slabp = list_entry(q, slab_t, list); - if (slabp->inuse == cachep->num || !slabp->inuse) - BUG(); + BUG_ON(slabp->inuse == cachep->num || !slabp->inuse); active_objs += slabp->inuse; active_slabs++; } list_for_each(q,&cachep->slabs_free) { slabp = list_entry(q, slab_t, list); - if (slabp->inuse) - BUG(); + BUG_ON(slabp->inuse); num_slabs++; } num_slabs+=active_slabs;