diff options
| author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-06-06 10:45:12 -0600 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-06-06 10:40:56 -0700 |
| commit | d2d6364dcbf6affb6f52cdae668c59117703c661 (patch) | |
| tree | 804fd96b22d5305981b76f44b8e3b1b11b5ab31e /drivers/nvdimm | |
| parent | d4dd70915ea82b7196108c1f0102bc09295c4513 (diff) | |
| download | lwn-d2d6364dcbf6affb6f52cdae668c59117703c661.tar.gz lwn-d2d6364dcbf6affb6f52cdae668c59117703c661.zip | |
libnvdimm, pmem: Complete REQ_FLUSH => REQ_PREFLUSH
Complete the move from REQ_FLUSH to REQ_PREFLUSH that apparently started
way back in v4.8.
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/pmem.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 9d714926ecf5..252adfab1e47 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -164,11 +164,6 @@ static blk_status_t pmem_do_bvec(struct pmem_device *pmem, struct page *page, return rc; } -/* account for REQ_FLUSH rename, replace with REQ_PREFLUSH after v4.8-rc1 */ -#ifndef REQ_FLUSH -#define REQ_FLUSH REQ_PREFLUSH -#endif - static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio) { blk_status_t rc = 0; @@ -179,7 +174,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio) struct pmem_device *pmem = q->queuedata; struct nd_region *nd_region = to_region(pmem); - if (bio->bi_opf & REQ_FLUSH) + if (bio->bi_opf & REQ_PREFLUSH) nvdimm_flush(nd_region); do_acct = nd_iostat_start(bio, &start); |