From 8326eb4605a3d7c87cac15d5d11316fb99cd9ab0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 10 Nov 2010 16:38:14 -0800 Subject: [PATCH] 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. --- include/sys/blkdev.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/sys/blkdev.h b/include/sys/blkdev.h index 3dc0fd2..7f24220 100644 --- a/include/sys/blkdev.h +++ b/include/sys/blkdev.h @@ -163,6 +163,16 @@ __blk_rq_bytes(struct request *req) } #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 static inline int get_disk_ro(struct gendisk *disk) -- 1.8.3.1