---

yaml --- r: 110562 b: refs/heads/master c: 8deaf72 h: refs/heads/master v: v3
git-mirror · Oct 9, 2008 · d4a4d7d · d4a4d7d
1 parent 461fa1f
commit d4a4d7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d00e29fd99dd63d1c51917604e35dee824ed567f
+refs/heads/master: 8deaf7210728c453295dc1cb2a5b66c68183ac85
diff --git a/trunk/include/linux/bio.h b/trunk/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);