[Devel] [PATCH RHEL7 COMMIT] ploop: Clear abort bit on replace delta

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-957.10.1.vz7.94.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-957.10.1.vz7.94.16
------>
commit 75afcf0f1cd63d807250e5338db03b0422105a51
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Fri Apr 19 18:39:11 2019 +0300

    ploop: Clear abort bit on replace delta
    
    New delta should perform IO well, so clear the bit
    to allow bio handling.
    
    https://pmc.acronis.com/browse/VSTOR-22414
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
    Reviewed-by: Andrey Zaitsev <azaitsev at virtuozzo.com>
---
 drivers/block/ploop/dev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/block/ploop/dev.c b/drivers/block/ploop/dev.c
index 09ef4e53f806..ca7bd0bbf5b7 100644
--- a/drivers/block/ploop/dev.c
+++ b/drivers/block/ploop/dev.c
@@ -3399,6 +3399,7 @@ static int ploop_replace_delta(struct ploop_device * plo, unsigned long arg)
 	ploop_quiesce(plo);
 	ploop_map_destroy(&plo->map);
 	list_replace_init(&old_delta->list, &delta->list);
+	clear_bit(PLOOP_S_ABORT, &plo->state);
 
 	spin_lock_irq(plo->queue->queue_lock);
 	queue_flag_clear(QUEUE_FLAG_STANDBY, plo->queue);