Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04accc4 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: revert part of d7533ad0e132f92e75c1b2eb7c26387b25a583c1 



We need bdev_get_integrity() to support the pending md/dm patches.

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

fs/bio-integrity.c

+0 −5
Original line number Diff line number Diff line
@@ -150,11 +150,6 @@ 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);

include/linux/blkdev.h

+7 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,12 @@ 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

struct blk_integrity *bdev_get_integrity(struct block_device *bdev)

{

	return bdev->bd_disk->integrity;

}



static inline int blk_integrity_rq(struct request *rq)

{

	if (rq->bio == NULL)
@@ -1029,6 +1035,7 @@ 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 blk_integrity_compare(a, b)		(0)

#define blk_integrity_register(a, b)		(0)

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