Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 4.8 compat: REQ_PREFLUSH 

The REQ_FLUSH flag was renamed REQ_PREFLUSH to avoid confusion with
REQ_OP_FLUSH.  See https://github.com/torvalds/linux/commit/28a8f0d3
for complete details.

Signed-off-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #4892
Issue #4899
This commit is contained in:
Brian Behlendorf 2016-07-27 18:06:17 +00:00 committed by Ned Bass
parent 68b8d22c6e
commit a0591c4370
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/blkdev_compat.h
View File

@ -303,12 +303,23 @@ bio_set_flags_failfast(struct block_device *bdev, int *flags)
* The existence of these flags implies that REQ_FLUSH an REQ_FUA are
* defined. Thus we can safely define VDEV_REQ_FLUSH and VDEV_REQ_FUA
* compatibility macros.
*
* Linux 4.8 renamed the REQ_FLUSH to REQ_PREFLUSH but there was no
* functional change in behavior.
*/
#ifdef WRITE_FLUSH_FUA
#define VDEV_WRITE_FLUSH_FUA WRITE_FLUSH_FUA
#define VDEV_REQ_FLUSH REQ_FLUSH
#ifdef REQ_PREFLUSH
#define VDEV_REQ_FLUSH REQ_PREFLUSH
#define VDEV_REQ_FUA REQ_FUA
#else
#define VDEV_REQ_FLUSH REQ_FLUSH
#define VDEV_REQ_FUA REQ_FUA
#endif
#else
#define VDEV_WRITE_FLUSH_FUA WRITE_BARRIER
#ifdef HAVE_BIO_RW_BARRIER
#define VDEV_REQ_FLUSH (1 << BIO_RW_BARRIER)
@ -317,6 +328,7 @@ bio_set_flags_failfast(struct block_device *bdev, int *flags)
#define VDEV_REQ_FLUSH REQ_HARDBARRIER
#define VDEV_REQ_FUA REQ_FUA
#endif
#endif
/*