Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2d6364d authored by Ross Zwisler's avatar Ross Zwisler Committed by Dan Williams
Browse files

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: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d4dd7091

drivers/nvdimm/pmem.c

+1 −6
Original line number Diff line number Diff line
@@ -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);