From: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
To: linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org
Cc: david@redhat.com, mst@redhat.com, pankaj.gupta@cloud.ionos.com,
Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Subject: [RFC 1/2] pmem: make nvdimm_flush asynchronous
Date: Mon, 20 Apr 2020 15:19:46 +0200 [thread overview]
Message-ID: <20200420131947.41991-2-pankaj.gupta.linux@gmail.com> (raw)
In-Reply-To: <20200420131947.41991-1-pankaj.gupta.linux@gmail.com>
This patch converts nvdimm_flush to return when
asynchronous flush is in process.
Signed-off-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
---
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
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
next prev parent reply other threads:[~2020-04-20 13:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-20 13:19 [RFC 0/2] virtio-pmem: Asynchronous flush Pankaj Gupta
2020-04-20 13:19 ` Pankaj Gupta [this message]
2020-04-20 13:19 ` [RFC 2/2] virtio_pmem: Async virtio-pmem flush Pankaj Gupta
2021-03-11 16:31 ` [RFC 0/2] virtio-pmem: Asynchronous flush David Hildenbrand
2021-03-12 4:21 ` Pankaj Gupta
2021-03-12 6:02 ` Dan Williams
2021-03-12 8:53 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200420131947.41991-2-pankaj.gupta.linux@gmail.com \
--to=pankaj.gupta.linux@gmail.com \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=mst@redhat.com \
--cc=pankaj.gupta@cloud.ionos.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).