History

block: revert part of d7533ad0e132f92e75c1b2eb7c26387b25a583c1

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

Jens Axboe committed 18 years ago

Commit b04accc1 parent 8deaf722 files · +7 −5Browse files

Unified · Split

2 files
  1. fs/bio-integrity.c +0 −5
  2. include/linux/blkdev.h +7 −0
fs/bio-integrity.c+0−5
@@ -150,11 +150,6 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, · 149 unmodified lines
150}150}
151EXPORT_SYMBOL(bio_integrity_add_page);151EXPORT_SYMBOL(bio_integrity_add_page);
152 152
153static struct blk_integrity *bdev_get_integrity(struct block_device *bdev)
154{
155 return bdev->bd_disk->integrity;
156}
157
158static int bdev_integrity_enabled(struct block_device *bdev, int rw)153static int bdev_integrity_enabled(struct block_device *bdev, int rw)
159{154{
160 struct blk_integrity *bi = bdev_get_integrity(bdev);155 struct blk_integrity *bi = bdev_get_integrity(bdev);
include/linux/blkdev.h+7−0
@@ -1016,6 +1016,12 @@ extern int blk_integrity_compare(struct block_device *, struct block_device *); · 1015 unmodified lines
1016extern int blk_rq_map_integrity_sg(struct request *, struct scatterlist *);1016extern int blk_rq_map_integrity_sg(struct request *, struct scatterlist *);
1017extern int blk_rq_count_integrity_sg(struct request *);1017extern int blk_rq_count_integrity_sg(struct request *);
1018 1018
1019static inline
1020struct blk_integrity *bdev_get_integrity(struct block_device *bdev)
1021{
1022 return bdev->bd_disk->integrity;
1023}
1024
1019static inline int blk_integrity_rq(struct request *rq)1025static inline int blk_integrity_rq(struct request *rq)
1020{1026{
1021 if (rq->bio == NULL)1027 if (rq->bio == NULL)
@@ -1029,6 +1035,7 @@ static inline int blk_integrity_rq(struct request *rq) · 7 unmodified lines
1029#define blk_integrity_rq(rq) (0)1035#define blk_integrity_rq(rq) (0)
1030#define blk_rq_count_integrity_sg(a) (0)1036#define blk_rq_count_integrity_sg(a) (0)
1031#define blk_rq_map_integrity_sg(a, b) (0)1037#define blk_rq_map_integrity_sg(a, b) (0)
1038#define bdev_get_integrity(a) (0)
1032#define blk_integrity_compare(a, b) (0)1039#define blk_integrity_compare(a, b) (0)
1033#define blk_integrity_register(a, b) (0)1040#define blk_integrity_register(a, b) (0)
1034#define blk_integrity_unregister(a) do { } while (0);1041#define blk_integrity_unregister(a) do { } while (0);