Commit 9e8c0d0d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove BIO_BUG_ON 



BIO_DEBUG is always defined, so just switch the two instances to use
BUG_ON directly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211012161804.991559-2-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e9ea1596

block/bio.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void bio_put_slab(struct bio_set *bs) 


void bvec_free(mempool_t *pool, struct bio_vec *bv, unsigned short nr_vecs)

{

	BIO_BUG_ON(nr_vecs > BIO_MAX_VECS);

	BUG_ON(nr_vecs > BIO_MAX_VECS);



	if (nr_vecs == BIO_MAX_VECS)

		mempool_free(bv, pool);
@@ -677,7 +677,7 @@ static void bio_alloc_cache_destroy(struct bio_set *bs) 
void bio_put(struct bio *bio)

{

	if (unlikely(bio_flagged(bio, BIO_REFFED))) {

		BIO_BUG_ON(!atomic_read(&bio->__bi_cnt));

		BUG_ON(!atomic_read(&bio->__bi_cnt));

		if (!atomic_dec_and_test(&bio->__bi_cnt))

			return;

	}

include/linux/bio.h

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ 
#include <linux/blk_types.h>

#include <linux/uio.h>



#define BIO_DEBUG



#ifdef BIO_DEBUG

#define BIO_BUG_ON	BUG_ON

#else

#define BIO_BUG_ON

#endif



#define BIO_MAX_VECS		256U



static inline unsigned int bio_max_segs(unsigned int nr_segs)