[RFC 1/2] pmem: make nvdimm_flush asynchronous
From: Pankaj Gupta
Date: Mon Apr 20 2020 - 09:20:09 EST
This patch converts nvdimm_flush to return when
asynchronous flush is in process.
Signed-off-by: Pankaj Gupta <pankaj.gupta.linux@xxxxxxxxx>
---
drivers/nvdimm/pmem.c | 15 ++++++++-------
drivers/nvdimm/region_devs.c | 3 +--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 4ffc6f7ca131..747ffaee513b 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -192,8 +192,10 @@ 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_PREFLUSH)
- ret = nvdimm_flush(nd_region, bio);
+ if ((bio->bi_opf & REQ_PREFLUSH) &&
+ nvdimm_flush(nd_region, bio)) {
+ return BLK_QC_T_NONE;
+ }
do_acct = nd_iostat_start(bio, &start);
bio_for_each_segment(bvec, bio, iter) {
@@ -207,11 +209,10 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
if (do_acct)
nd_iostat_end(bio, start);
- if (bio->bi_opf & REQ_FUA)
- ret = nvdimm_flush(nd_region, bio);
-
- if (ret)
- bio->bi_status = errno_to_blk_status(ret);
+ if (bio->bi_opf & REQ_FUA) {
+ nvdimm_flush(nd_region, bio);
+ return BLK_QC_T_NONE;
+ }
bio_endio(bio);
return BLK_QC_T_NONE;
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
index a19e535830d9..1caa13f1523f 100644
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@ -1091,8 +1091,7 @@ int nvdimm_flush(struct nd_region *nd_region, struct bio *bio)
if (!nd_region->flush)
rc = generic_nvdimm_flush(nd_region);
else {
- if (nd_region->flush(nd_region, bio))
- rc = -EIO;
+ rc = nd_region->flush(nd_region, bio);
}
return rc;
--
2.20.1