diff options
| author |   Alberto Bertogli <albertito@blitiri.com.ar> | 2008-10-02 12:46:53 +0200 |
|---|---|---|
| committer |   Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 08:56:21 +0200 |
| commit | 8deaf7210728c453295dc1cb2a5b66c68183ac85 (patch) | |
| tree | bb4bead2773c733e5164a44b784c9601b458821d /include/linux/bio.h | |
| parent | block: remove end_{queued|dequeued}_request() (diff) | |
| download | linux-dev-8deaf7210728c453295dc1cb2a5b66c68183ac85.tar.xz linux-dev-8deaf7210728c453295dc1cb2a5b66c68183ac85.zip | |
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/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 6520ee1a3f6d..98c2d0570657 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); |