public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] bio.h: Remove unused conditional code
@ 2008-09-27  2:09 Alberto Bertogli
  2008-10-02 10:48 ` Jens Axboe
  0 siblings, 1 reply; 2+ messages in thread
From: Alberto Bertogli @ 2008-09-27  2:09 UTC (permalink / raw)
  To: Jens Axboe, Martin K. Petersen, linux-kernel; +Cc: Alberto Bertogli

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>
---
 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 0933a14..57f9532 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -458,14 +458,7 @@ static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,
 #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);
-- 
1.6.0.87.g2858d


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] bio.h: Remove unused conditional code
  2008-09-27  2:09 [PATCH] bio.h: Remove unused conditional code Alberto Bertogli
@ 2008-10-02 10:48 ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2008-10-02 10:48 UTC (permalink / raw)
  To: Alberto Bertogli; +Cc: Martin K. Petersen, linux-kernel

On Fri, Sep 26 2008, Alberto Bertogli wrote:
> The whole bio_integrity() definition is inside an #ifdef
> CONFIG_BLK_DEV_INTEGRITY, there's no need for the conditional code.

Applied

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-10-02 10:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-27  2:09 [PATCH] bio.h: Remove unused conditional code Alberto Bertogli
2008-10-02 10:48 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox