Home » Mailing list archives » linux-kernel » 2008 » October » 2

Re: [PATCH] bio.h: Remove unused conditional code

Previous thread: Use CPUID to communicate with the hypervisor. by Alok Kataria on Friday, September 26, 2008 - 4:46 pm. (49 messages)

Next thread: [PATCH] Documentation/block/data-integrity.txt: Fix section numbers by Alberto Bertogli on Friday, September 26, 2008 - 7:10 pm. (1 message)
[view original message]
From: Alberto Bertogli
Subject: [PATCH] bio.h: Remove unused conditional code
Date: Friday, September 26, 2008 - 7:09 pm

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

--


[ message continues ]
[view original message]
From: Jens Axboe
Subject: Re: [PATCH] bio.h: Remove unused conditional code
Date: Thursday, October 2, 2008 - 3:48 am

Applied

-- 
Jens Axboe

--


[ message continues ]
Previous thread: Use CPUID to communicate with the hypervisor. by Alok Kataria on Friday, September 26, 2008 - 4:46 pm. (49 messages)

Next thread: [PATCH] Documentation/block/data-integrity.txt: Fix section numbers by Alberto Bertogli on Friday, September 26, 2008 - 7:10 pm. (1 message)