diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2010-08-10 12:14:27 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-10 12:14:27 -0400 |
commit | de75d60d5ea235e6e09f4962ab22541ce0fe176a (patch) | |
tree | 68530906b79f08d190c4fa7950c3a527ab980853 | |
parent | a4cc14ec9f0ef579262a81170a2eaf760844c471 (diff) |
block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n
These form the basis of the basic WRITE etc primitives, so we
need them to be always visible. Otherwise we see errors like:
mm/filemap.c:2164: error: 'REQ_WRITE' undeclared
fs/read_write.c:362: error: 'REQ_WRITE' undeclared
fs/splice.c:1108: error: 'REQ_WRITE' undeclared
fs/aio.c:1496: error: 'REQ_WRITE' undeclared
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r-- | include/linux/blk_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 118523734af0..53691774d34e 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h | |||
@@ -108,6 +108,8 @@ struct bio { | |||
108 | #define BIO_POOL_MASK (1UL << BIO_POOL_OFFSET) | 108 | #define BIO_POOL_MASK (1UL << BIO_POOL_OFFSET) |
109 | #define BIO_POOL_IDX(bio) ((bio)->bi_flags >> BIO_POOL_OFFSET) | 109 | #define BIO_POOL_IDX(bio) ((bio)->bi_flags >> BIO_POOL_OFFSET) |
110 | 110 | ||
111 | #endif /* CONFIG_BLOCK */ | ||
112 | |||
111 | /* | 113 | /* |
112 | * Request flags. For use in the cmd_flags field of struct request, and in | 114 | * Request flags. For use in the cmd_flags field of struct request, and in |
113 | * bi_rw of struct bio. Note that some flags are only valid in either one. | 115 | * bi_rw of struct bio. Note that some flags are only valid in either one. |
@@ -189,5 +191,4 @@ enum rq_flag_bits { | |||
189 | #define REQ_IO_STAT (1 << __REQ_IO_STAT) | 191 | #define REQ_IO_STAT (1 << __REQ_IO_STAT) |
190 | #define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE) | 192 | #define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE) |
191 | 193 | ||
192 | #endif /* CONFIG_BLOCK */ | ||
193 | #endif /* __LINUX_BLK_TYPES_H */ | 194 | #endif /* __LINUX_BLK_TYPES_H */ |