Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de75d60d authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent a4cc14ec

include/linux/blk_types.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */