X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_bitmap.c;h=481558041ddfe5b80f708215c9c82b9e10aaedfd;hp=dc673e8430f20e8c0d956132333d5a93453cdcb1;hb=9d9b662225f9b3684bb4ebd3646216f3ab190ed9;hpb=46eb953ecab322d3385ccf84c75d969de8542317 diff --git a/yaffs_bitmap.c b/yaffs_bitmap.c index dc673e8..4815580 100644 --- a/yaffs_bitmap.c +++ b/yaffs_bitmap.c @@ -1,8 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. - * for Toby Churchill Ltd and Brightstar Engineering + * Copyright (C) 2002-2018 Aleph One Ltd. * * Created by Charles Manning * @@ -19,11 +18,12 @@ static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk) { - if (blk < dev->internal_start_block || blk > dev->internal_end_block) { + if (blk < (int)dev->internal_start_block || + blk > (int)dev->internal_end_block) { yaffs_trace(YAFFS_TRACE_ERROR, "BlockBits block %d is not valid", blk); - YBUG(); + BUG(); } return dev->chunk_bits + (dev->chunk_bit_stride * (blk - dev->internal_start_block)); @@ -31,12 +31,13 @@ static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk) void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk) { - if (blk < dev->internal_start_block || blk > dev->internal_end_block || - chunk < 0 || chunk >= dev->param.chunks_per_block) { + if (blk < (int)dev->internal_start_block || + blk > (int)dev->internal_end_block || + chunk < 0 || chunk >= (int)dev->param.chunks_per_block) { yaffs_trace(YAFFS_TRACE_ERROR, "Chunk Id (%d:%d) invalid", blk, chunk); - YBUG(); + BUG(); } }