From 912433770fd90b088366febccbc39d9651201bab Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 10 Aug 2010 12:14:27 -0400 Subject: [PATCH] --- yaml --- r: 208355 b: refs/heads/master c: de75d60d5ea235e6e09f4962ab22541ce0fe176a h: refs/heads/master i: 208353: 657dc191fa0e663abd266eff56309005e769d448 208351: 847c1bffdcc5c4eb879c48fa5e7d6855e040b1e7 v: v3 --- [refs] | 2 +- trunk/include/linux/blk_types.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 97e56a32d90e..50da0e4e81b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4cc14ec9f0ef579262a81170a2eaf760844c471 +refs/heads/master: de75d60d5ea235e6e09f4962ab22541ce0fe176a diff --git a/trunk/include/linux/blk_types.h b/trunk/include/linux/blk_types.h index 118523734af0..53691774d34e 100644 --- a/trunk/include/linux/blk_types.h +++ b/trunk/include/linux/blk_types.h @@ -108,6 +108,8 @@ struct bio { #define BIO_POOL_MASK (1UL << BIO_POOL_OFFSET) #define BIO_POOL_IDX(bio) ((bio)->bi_flags >> BIO_POOL_OFFSET) +#endif /* CONFIG_BLOCK */ + /* * Request flags. For use in the cmd_flags field of struct request, and in * bi_rw of struct bio. Note that some flags are only valid in either one. @@ -189,5 +191,4 @@ enum rq_flag_bits { #define REQ_IO_STAT (1 << __REQ_IO_STAT) #define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE) -#endif /* CONFIG_BLOCK */ #endif /* __LINUX_BLK_TYPES_H */