Linux 2.6.36 compat, blk_* macros removed

Most of the blk_* macros were removed in 2.6.36.  Ostensibly this was
done to improve readability and allow easier grepping.  However, from
a portability stand point the macros are helpful.  Therefore the needed
macros are redefined here if they are missing from the kernel.
This commit is contained in:
Brian Behlendorf 2010-11-10 16:38:14 -08:00
parent 675de5aa37
commit 8326eb4605
1 changed files with 10 additions and 0 deletions

View File

@ -163,6 +163,16 @@ __blk_rq_bytes(struct request *req)
} }
#endif /* !HAVE_BLK_RQ_BYTES || HAVE_BLK_RQ_BYTES_GPL_ONLY */ #endif /* !HAVE_BLK_RQ_BYTES || HAVE_BLK_RQ_BYTES_GPL_ONLY */
/*
* Most of the blk_* macros were removed in 2.6.36. Ostensibly this was
* done to improve readability and allow easier grepping. However, from
* a portability stand point the macros are helpful. Therefore the needed
* macros are redefined here if they are missing from the kernel.
*/
#ifndef blk_fs_request
#define blk_fs_request(rq) ((rq)->cmd_type == REQ_TYPE_FS)
#endif
#ifndef HAVE_GET_DISK_RO #ifndef HAVE_GET_DISK_RO
static inline int static inline int
get_disk_ro(struct gendisk *disk) get_disk_ro(struct gendisk *disk)