From 97bef908551ee7914fbbbdbec8e6cf8c094724fd Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Thu, 2 Oct 2008 18:47:49 +0200 Subject: [PATCH] --- yaml --- r: 110567 b: refs/heads/master c: b02739b01c5309d74a59859f2ce92c931d1f1955 h: refs/heads/master i: 110565: bc1a2f0ef905a0f7e210d368c8e0633ecf8fe648 110563: ac4ee06fccfd5c00a4f9e15148c055ad9d68ea72 110559: bac8945044ece3457d277f64b9faba3b3b1179ea v: v3 --- [refs] | 2 +- trunk/include/linux/blkdev.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 424207015aef..1368c39d3e8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad7fce93147d32ae53d25d9ea1a8ba31a239deee +refs/heads/master: b02739b01c5309d74a59859f2ce92c931d1f1955 diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index 00d340b0f758..a92d9e4ea96e 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -1022,6 +1022,11 @@ struct blk_integrity *bdev_get_integrity(struct block_device *bdev) return bdev->bd_disk->integrity; } +static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk) +{ + return disk->integrity; +} + static inline int blk_integrity_rq(struct request *rq) { if (rq->bio == NULL) @@ -1036,6 +1041,7 @@ static inline int blk_integrity_rq(struct request *rq) #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_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);