diff options
| author | Jens Axboe <axboe@fb.com> | 2016-04-13 21:33:19 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-04-13 21:33:19 +0200 |
| commit | c888a8f95ae5b1067855235b3b71c1ebccf504f5 (patch) | |
| tree | b40d388cf1b30d5ac95a7472e4ca433d3ca18c6d /drivers/target | |
| parent | nvme: Avoid reset work on watchdog timer function during error recovery (diff) | |
| download | linux-c888a8f95ae5b1067855235b3b71c1ebccf504f5.tar.xz linux-c888a8f95ae5b1067855235b3b71c1ebccf504f5.zip | |
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 'drivers/target')
| -rw-r--r-- | drivers/target/target_core_iblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 026a758e5778..7c4efb4417b0 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c @@ -687,10 +687,10 @@ iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, * Force writethrough using WRITE_FUA if a volatile write cache * is not enabled, or if initiator set the Force Unit Access bit. */ - if (q->flush_flags & REQ_FUA) { + if (test_bit(QUEUE_FLAG_FUA, &q->queue_flags)) { if (cmd->se_cmd_flags & SCF_FUA) rw = WRITE_FUA; - else if (!(q->flush_flags & REQ_FLUSH)) + else if (!test_bit(QUEUE_FLAG_WC, &q->queue_flags)) rw = WRITE_FUA; else rw = WRITE; @@ -836,7 +836,7 @@ static bool iblock_get_write_cache(struct se_device *dev) struct block_device *bd = ib_dev->ibd_bd; struct request_queue *q = bdev_get_queue(bd); - return q->flush_flags & REQ_FLUSH; + return test_bit(QUEUE_FLAG_WC, &q->queue_flags); } static const struct target_backend_ops iblock_ops = { |