diff options
| author | Jens Axboe <axboe@fb.com> | 2016-04-13 13:33:19 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-04-13 13:33:19 -0600 |
| commit | c888a8f95ae5b1067855235b3b71c1ebccf504f5 (patch) | |
| tree | b40d388cf1b30d5ac95a7472e4ca433d3ca18c6d /include/linux/blkdev.h | |
| parent | c875a7093f0479215cf9bf51356d7638f2ec5746 (diff) | |
| download | linux-0-day-c888a8f95ae5b1067855235b3b71c1ebccf504f5.tar.gz linux-0-day-c888a8f95ae5b1067855235b3b71c1ebccf504f5.tar.xz | |
block: kill off q->flush_flags
Now that we converted everything to the newer block write cache
interface, kill off the queue flush_flags and queueable flush
entries.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index f3f232fa505de..57c085917da69 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -433,8 +433,6 @@ struct request_queue { /* * for flush operations */ - unsigned int flush_flags; - unsigned int flush_not_queueable:1; struct blk_flush_queue *fq; struct list_head requeue_list; @@ -493,6 +491,7 @@ struct request_queue { #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_FLUSH_NQ 25 /* flush not queueuable */ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \ @@ -1365,7 +1364,7 @@ static inline unsigned int block_size(struct block_device *bdev) static inline bool queue_flush_queueable(struct request_queue *q) { - return !q->flush_not_queueable; + return !test_bit(QUEUE_FLAG_FLUSH_NQ, &q->queue_flags); } typedef struct {struct page *v;} Sector; |