diff options
| author | Jens Axboe <axboe@fb.com> | 2016-04-12 15:46:35 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-04-12 15:46:35 -0600 |
| commit | 2f9a0b33ac6c4a2accaf787456080af35f1cab0b (patch) | |
| tree | f9fff8867f90c42f1ec70e0ba86cf7529f881ef7 /include/linux | |
| parent | e8f1e1630b0a98685d1a3521e8aba0dc7e68082c (diff) | |
| parent | 93e9d8e836cb1a9a58b33eb6643bf061c6119ef2 (diff) | |
Merge branch 'for-4.7/core' into for-4.7/drivers
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index bbaa76757018..ba72687c5654 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -491,6 +491,8 @@ struct request_queue { #define QUEUE_FLAG_INIT_DONE 20 /* queue is initialized */ #define QUEUE_FLAG_NO_SG_MERGE 21 /* don't attempt to merge SG segments*/ #define QUEUE_FLAG_POLL 22 /* IO polling enabled if set */ +#define QUEUE_FLAG_WC 23 /* Write back caching */ +#define QUEUE_FLAG_FUA 24 /* device supports FUA writes */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \ @@ -1009,6 +1011,7 @@ extern void blk_queue_rq_timed_out(struct request_queue *, rq_timed_out_fn *); extern void blk_queue_rq_timeout(struct request_queue *, unsigned int); extern void blk_queue_flush(struct request_queue *q, unsigned int flush); extern void blk_queue_flush_queueable(struct request_queue *q, bool queueable); +extern void blk_queue_write_cache(struct request_queue *q, bool enabled, bool fua); extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *); |