Commit 9c02f2b0 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: cleanup some of the integrity stuff in blkdev.h 



Don't put functions that are only used in fs/bio-integrity.c in
blkdev.h, it's much cleaner to just keep it in there. Also kill
completely unused bdev_get_tag_size()

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

fs/bio-integrity.c

+31 −0
Original line number Diff line number Diff line
@@ -150,6 +150,29 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, 
}

EXPORT_SYMBOL(bio_integrity_add_page);



static struct blk_integrity *bdev_get_integrity(struct block_device *bdev)

{

	return bdev->bd_disk->integrity;

}



static int bdev_integrity_enabled(struct block_device *bdev, int rw)

{

	struct blk_integrity *bi = bdev_get_integrity(bdev);



	if (bi == NULL)

		return 0;



	if (rw == READ && bi->verify_fn != NULL &&

	    (bi->flags & INTEGRITY_FLAG_READ))

		return 1;



	if (rw == WRITE && bi->generate_fn != NULL &&

	    (bi->flags & INTEGRITY_FLAG_WRITE))

		return 1;



	return 0;

}



/**

 * bio_integrity_enabled - Check whether integrity can be passed

 * @bio:	bio to check
@@ -313,6 +336,14 @@ static void bio_integrity_generate(struct bio *bio) 
	}

}



static inline unsigned short blk_integrity_tuple_size(struct blk_integrity *bi)

{

	if (bi)

		return bi->tuple_size;



	return 0;

}



/**

 * bio_integrity_prep - Prepare bio for integrity I/O

 * @bio:	bio to prepare

include/linux/blkdev.h

+0 −43
Original line number Diff line number Diff line
@@ -1004,47 +1004,6 @@ extern int blk_integrity_compare(struct block_device *, struct block_device *); 
extern int blk_rq_map_integrity_sg(struct request *, struct scatterlist *);

extern int blk_rq_count_integrity_sg(struct request *);



static inline unsigned short blk_integrity_tuple_size(struct blk_integrity *bi)

{

	if (bi)

		return bi->tuple_size;



	return 0;

}



static inline struct blk_integrity *bdev_get_integrity(struct block_device *bdev)

{

	return bdev->bd_disk->integrity;

}



static inline unsigned int bdev_get_tag_size(struct block_device *bdev)

{

	struct blk_integrity *bi = bdev_get_integrity(bdev);



	if (bi)

		return bi->tag_size;



	return 0;

}



static inline int bdev_integrity_enabled(struct block_device *bdev, int rw)

{

	struct blk_integrity *bi = bdev_get_integrity(bdev);



	if (bi == NULL)

		return 0;



	if (rw == READ && bi->verify_fn != NULL &&

	    (bi->flags & INTEGRITY_FLAG_READ))

		return 1;



	if (rw == WRITE && bi->generate_fn != NULL &&

	    (bi->flags & INTEGRITY_FLAG_WRITE))

		return 1;



	return 0;

}



static inline int blk_integrity_rq(struct request *rq)

{

	if (rq->bio == NULL)
@@ -1058,8 +1017,6 @@ static inline int blk_integrity_rq(struct request *rq) 
#define blk_integrity_rq(rq)			(0)

#define blk_rq_count_integrity_sg(a)		(0)

#define blk_rq_map_integrity_sg(a, b)		(0)

#define bdev_get_integrity(a)			(0)

#define bdev_get_tag_size(a)			(0)

#define blk_integrity_compare(a, b)		(0)

#define blk_integrity_register(a, b)		(0)

#define blk_integrity_unregister(a)		do { } while (0);