diff options
| author | Tim Chase <[email protected]> | 2015-05-08 15:49:56 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-05-11 15:07:00 -0700 |
| commit | e48533383b6ba1737245ac4338c492865a97b0e9 (patch) | |
| tree | f1dfd06194774c61748bc7793aa7fc0e25a407e0 /include/linux | |
| parent | 492b1d2ef0aa14c22a8f075d948950d072970c17 (diff) | |
Linux 2.6.36 compat, use REQ_FAILFAST_MASK and remove pre-2.6.36 support
Commit f4af6bb783b0b7f2a6075cb1c74c225db8a157b2 which added support
for REQ_FAILFAST_MASK but the new autoconf test didn't use the same
preprocessor macro name as the code did.
The effect is that FAILFAST mode has not been enabled for ZoL in any
post-2.6.35 kernel.
Retire the HAVE_BIO_RW_FAILFAST interface used in pre-2.6.28 kernels.
Raise an error condition if the FAILFAST interface can't be detected.
Signed-off-by: Tim Chase <[email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3386
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev_compat.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index 8566033fc..89e888c30 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -347,26 +347,21 @@ bio_set_flags_failfast(struct block_device *bdev, int *flags) #endif /* BLOCK_EXT_MAJOR */ #endif /* CONFIG_BUG */ -#ifdef HAVE_BIO_RW_FAILFAST_DTD +#if defined(HAVE_BIO_RW_FAILFAST_DTD) /* BIO_RW_FAILFAST_* preferred interface from 2.6.28 - 2.6.35 */ *flags |= ( (1 << BIO_RW_FAILFAST_DEV) | (1 << BIO_RW_FAILFAST_TRANSPORT) | (1 << BIO_RW_FAILFAST_DRIVER)); -#else -#ifdef HAVE_BIO_RW_FAILFAST - /* BIO_RW_FAILFAST preferred interface from 2.6.12 - 2.6.27 */ - *flags |= (1 << BIO_RW_FAILFAST); -#else -#ifdef HAVE_REQ_FAILFAST_MASK +#elif defined(HAVE_REQ_FAILFAST_MASK) /* * REQ_FAILFAST_* preferred interface from 2.6.36 - 2.6.xx, * the BIO_* and REQ_* flags were unified under REQ_* flags. */ *flags |= REQ_FAILFAST_MASK; -#endif /* HAVE_REQ_FAILFAST_MASK */ -#endif /* HAVE_BIO_RW_FAILFAST */ -#endif /* HAVE_BIO_RW_FAILFAST_DTD */ +#else +#error "Undefined block IO FAILFAST interface." +#endif } /* |