Commit 6e2401ad authored by Jens Axboe's avatar Jens Axboe
Browse files

block: integrity cleanups 



- No need to check for NULL bio, we'll get an immediate oops anyway.
- Make bio_integrity() a proper function.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent da9cbc87

include/linux/bio.h

+8 −1
Original line number Diff line number Diff line
@@ -458,7 +458,14 @@ static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx, 
#define bip_for_each_vec(bvl, bip, i)					\

	__bip_for_each_vec(bvl, bip, i, (bip)->bip_idx)



#define bio_integrity(bio)	((bio)->bi_integrity ? 1 : 0)

static inline int bio_integrity(struct bio *bio)

{

#if defined(CONFIG_BLK_DEV_INTEGRITY)

	return bio->bi_integrity != NULL;

#else

	return 0;

#endif

}



extern struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *, gfp_t, unsigned int, struct bio_set *);

extern struct bio_integrity_payload *bio_integrity_alloc(struct bio *, gfp_t, unsigned int);

include/linux/blkdev.h

+0 −4
Original line number Diff line number Diff line
@@ -860,7 +860,6 @@ void kblockd_flush_work(struct work_struct *work); 
#define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \

	MODULE_ALIAS("block-major-" __stringify(major) "-*")





#if defined(CONFIG_BLK_DEV_INTEGRITY)



#define INTEGRITY_FLAG_READ	1	/* verify data integrity on read */
@@ -945,8 +944,6 @@ static inline int bdev_integrity_enabled(struct block_device *bdev, int rw) 


static inline int blk_integrity_rq(struct request *rq)

{

	BUG_ON(rq->bio == NULL);



	return bio_integrity(rq->bio);

}
@@ -963,7 +960,6 @@ static inline int blk_integrity_rq(struct request *rq) 


#endif /* CONFIG_BLK_DEV_INTEGRITY */





#else /* CONFIG_BLOCK */

/*

 * stubs for when the block layer is configured out