From: Jens Axboe Date: Wed, 27 Oct 2010 14:30:29 +0000 (-0600) Subject: Make it work on 2.6.35 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e66b988ba25013b28da27152a66a1ddd32dcf9b1;p=binject.git Make it work on 2.6.35 Signed-off-by: Jens Axboe --- diff --git a/kcompat.h b/kcompat.h index 2e727ea..93feccd 100644 --- a/kcompat.h +++ b/kcompat.h @@ -33,7 +33,7 @@ static inline unsigned int binject_get_bs(struct request_queue *q) static inline void binject_mark_bio_write(struct bio *bio) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) bio->bi_rw |= REQ_WRITE; #else bio->bi_rw |= (1 << BIO_RW); @@ -64,7 +64,7 @@ binject_create_slab(const char *name, size_t obj_size, unsigned long flags, #endif } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) #define B_REQ_WRITE REQ_WRITE #define B_REQ_SYNC REQ_SYNC #define B_REQ_UNPLUG REQ_UNPLUG @@ -77,6 +77,19 @@ binject_create_slab(const char *name, size_t obj_size, unsigned long flags, #define B_REQ_FAILFAST_DRIVER REQ_FAILFAST_DRIVER #define B_REQ_DISCARD REQ_DISCARD #define B_REQ_FLUSH REQ_FLUSH +#elif LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34) +#define B_REQ_WRITE (1 << BIO_RW) +#define B_REQ_SYNC (1 << BIO_RW_SYNCIO) +#define B_REQ_UNPLUG (1 << BIO_RW_UNPLUG) +#define B_REQ_NOIDLE (1 << BIO_RW_NOIDLE) +#define B_REQ_HARDBARRIER (1 << BIO_RW_BARRIER) +#define B_REQ_META (1 << BIO_RW_META) +#define B_REQ_RAHEAD (1 << BIO_RW_AHEAD) +#define B_REQ_FAILFAST_DEV (1 << BIO_RW_FAILFAST_DEV) +#define B_REQ_FAILFAST_TRANSPORT (1 << BIO_RW_FAILFAST_TRANSPORT) +#define B_REQ_FAILFAST_DRIVER (1 << BIO_RW_FAILFAST_DRIVER) +#define B_REQ_DISCARD (1 << BIO_RW_DISCARD) +#define B_REQ_FLUSH 0 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) #define B_REQ_WRITE (1 << BIO_RW) #define B_REQ_SYNC (1 << BIO_RW_SYNC)