aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlberto Bertogli <albertito@blitiri.com.ar>2008-10-02 12:46:53 +0200
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 08:56:21 +0200
commit8deaf7210728c453295dc1cb2a5b66c68183ac85 (patch)
treebb4bead2773c733e5164a44b784c9601b458821d /include
parentd00e29fd99dd63d1c51917604e35dee824ed567f (diff)
bio.h: Remove unused conditional code
The whole bio_integrity() definition is inside an #ifdef CONFIG_BLK_DEV_INTEGRITY, there's no need for the conditional code. Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/bio.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 6520ee1a3f6..98c2d057065 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -457,14 +457,7 @@ static inline int bio_has_data(struct bio *bio)
#define bip_for_each_vec(bvl, bip, i) \
__bip_for_each_vec(bvl, bip, i, (bip)->bip_idx)
-static inline int bio_integrity(struct bio *bio)
-{
-#if defined(CONFIG_BLK_DEV_INTEGRITY)
- return bio->bi_integrity != NULL;
-#else
- return 0;
-#endif
-}
+#define bio_integrity(bio) (bio->bi_integrity != NULL)
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);