Re: [2.6 patch][3/3] mm/ BUG -> BUG_ON conversions

[Denis Vlasenko]

On Saturday 28 August 2004 18:18, Adrian Bunk wrote:
> The patch below does BUG -> BUG_ON conversions in mm/ .
>
> diffstat output:
>  mm/bootmem.c    |    6 ++----
>  mm/filemap.c    |    6 ++----
>  mm/highmem.c    |   15 +++++----------
>  mm/memory.c     |   12 ++++--------
>  mm/mempool.c    |    5 +++--
>  mm/mmap.c       |   12 ++++--------
>  mm/mprotect.c   |    3 +--
>  mm/msync.c      |    3 +--
>  mm/page_alloc.c |    3 +--
>  mm/pdflush.c    |    3 +--
>  mm/shmem.c      |    3 +--
>  mm/slab.c       |   30 ++++++++++--------------------
>  mm/swap.c       |   12 ++++--------
>  mm/swap_state.c |    6 ++----
>  mm/swapfile.c   |    6 ++----
>  mm/vmalloc.c    |    3 +--
>  mm/vmscan.c     |   18 ++++++------------
>  17 files changed, 50 insertions(+), 96 deletions(-)
>
>
> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
>
> --- linux-2.6.9-rc1-mm1-full-3.4/mm/bootmem.c.old	2004-08-28
> 16:25:18.000000000 +0200 +++
> linux-2.6.9-rc1-mm1-full-3.4/mm/bootmem.c	2004-08-28 16:26:48.000000000
> +0200 @@ -125,8 +125,7 @@
>  	sidx = start - (bdata->node_boot_start/PAGE_SIZE);
>
>  	for (i = sidx; i < eidx; i++) {
> -		if (unlikely(!test_and_clear_bit(i, bdata->node_bootmem_map)))
> -			BUG();
> +		BUG_ON(!test_and_clear_bit(i, bdata->node_bootmem_map));
>  	}
>  }
>
> @@ -246,8 +245,7 @@
>  	 * Reserve the area now:
>  	 */
>  	for (i = start; i < start+areasize; i++)
> -		if (unlikely(test_and_set_bit(i, bdata->node_bootmem_map)))
> -			BUG();
> +		BUG_ON(test_and_set_bit(i, bdata->node_bootmem_map));

BUG_ON is like assert(). It may be #defined to nothing.
Do not place expression with side effects into it.
--
vda

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/