The commit is pushed to "branch-rh9-5.14.0-427.92.1.vz9.88.x-ovz" and will
appear at [email protected]:openvz/vzkernel.git
after rh9-5.14.0-427.92.1.vz9.88.7
------>
commit e71e309c90c5adcb1db14742dd0099a50b543030
Author: Pavel Tikhomirov <[email protected]>
Date: Tue Nov 11 16:05:37 2025 +0800
Revert "dm-ploop: set IOCB_DSYNC on all FUA requests"
This reverts commit 52daf66590faf54aad9e438bae9278b71c22da0f.
We don't have REQ_FUA in dm-ploop anymore after commit 4e659676652fa
("md: mark dm-ploop and dm-qcow2 targets non-fua") so we can revert all
our REQ_FUA specific handling.
https://virtuozzo.atlassian.net/browse/VSTOR-119063
Signed-off-by: Pavel Tikhomirov <[email protected]>
Feature: dm-ploop: ploop target driver
---
drivers/md/dm-ploop-map.c | 22 ++++------------------
drivers/md/dm-ploop-target.c | 2 --
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c
index 4b11836f66573..ecb2eadbd0ae3 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -141,7 +141,7 @@ static void ploop_init_prq_and_embedded_pio(struct ploop
*ploop,
struct request *rq, struct ploop_rq *prq, struct pio *pio)
{
ploop_init_prq(prq, rq);
- ploop_init_pio(ploop, rq->cmd_flags, pio);
+ ploop_init_pio(ploop, req_op(rq), pio);
pio->css = prq->css;
pio->endio_cb = ploop_prq_endio;
@@ -291,11 +291,7 @@ static struct pio *ploop_split_and_chain_pio(struct ploop
*ploop,
if (!split)
return NULL;
- /*
- * Do not copy REQ_FUA to every split pio. we will sync
- * before calling endio on original pio.
- */
- ploop_init_pio(ploop, pio->bi_op & ~REQ_FUA, split);
+ ploop_init_pio(ploop, pio->bi_op, split);
split->css = pio->css;
split->queue_list_id = pio->queue_list_id;
split->free_on_endio = true;
@@ -1800,17 +1796,7 @@ static bool
ploop_locate_new_cluster_and_attach_pio(struct ploop *ploop,
goto error;
}
-#ifdef PLOOP_DELAYWB
- if (pio->bi_op & REQ_FUA) {
- piwb->pio->bi_op |= REQ_FUA;
- ploop_attach_end_action(pio, piwb);
- ploop_md_up_prio(ploop, md);
- }
-#else
- if (pio->bi_op & REQ_FUA) {
- piwb->pio->bi_op |= REQ_FUA;
- ploop_md_up_prio(ploop, md);
- }
+#ifndef PLOOP_DELAYWB
ploop_attach_end_action(pio, piwb);
#endif
attached = true;
@@ -2557,7 +2543,7 @@ static void ploop_submit_embedded_pio(struct ploop
*ploop, struct pio *pio, gfp_
if (blk_rq_bytes(rq)) {
pio->queue_list_id = PLOOP_LIST_PREPARE;
} else {
- WARN_ON_ONCE(!((pio->bi_op & REQ_OP_MASK) == REQ_OP_FLUSH));
+ WARN_ON_ONCE(pio->bi_op != REQ_OP_FLUSH);
pio->queue_list_id = PLOOP_LIST_FLUSH;
}
diff --git a/drivers/md/dm-ploop-target.c b/drivers/md/dm-ploop-target.c
index 1698131aca3e1..34fa0665935df 100644
--- a/drivers/md/dm-ploop-target.c
+++ b/drivers/md/dm-ploop-target.c
@@ -62,8 +62,6 @@ void ploop_call_rw_iter(struct file *file, loff_t pos,
unsigned rw,
iocb->ki_pos = pos;
iocb->ki_complete = ploop_aio_complete;
iocb->ki_flags |= IOCB_ALLOC_CACHE;
- if (rw == WRITE && pio->bi_op & REQ_FUA)
- iocb->ki_flags |= IOCB_DSYNC;
atomic_set(&pio->aio_ref, 2);
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
