[Devel] [PATCH RHEL8 COMMIT] ploop: Rename in submit_cluster_write()

[Konstantin Khorenko]

The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.50
------>
commit a90ac64af4765ce441a42aa0e24ac4af3bd8551e
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Tue Jun 29 16:08:14 2021 +0300

    ploop: Rename in submit_cluster_write()
    
    No functional changes
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
    
    ==========================
    Preparation for #PSBM-124550 (part 2)
    
    Kirill Tkhai (14):
          ploop: Kill "get_delta_name" alias
          ploop: Use initial pio for COW
          ploop: Rename cluster_pio into aux_pio
          ploop: Shorten variable names
          ploop: Rename in submit_cluster_write()
          ploop: Use defer_pios() instead of manual code
          ploop: Use array of pios instead of separate lists
          ploop: Generalize dispatch_pios usage
          ploop: Unify process_delta_wb()
          ploop: Remove unused struct member
          ploop: Rename page_nr
          ploop: Return md page from ploop_bat_entries()
          ploop: Kill dead check in ploop_attach_end_action()
          ploop: Delay bio if md page is BUSY
---
 drivers/md/dm-ploop-map.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c
index a9c8a6d3dca2..9bf3554d4f95 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -1210,7 +1210,7 @@ static void initiate_cluster_cow(struct ploop *ploop, unsigned int level,
 
 static void submit_cluster_write(struct ploop_cow *cow)
 {
-	struct pio *pio = cow->aux_pio;
+	struct pio *aux_pio = cow->aux_pio;
 	struct ploop *ploop = cow->ploop;
 	unsigned int dst_clu;
 
@@ -1218,14 +1218,14 @@ static void submit_cluster_write(struct ploop_cow *cow)
 		goto error;
 	cow->dst_clu = dst_clu;
 
-	init_pio(ploop, REQ_OP_WRITE, pio);
-	pio_prepare_offsets(ploop, pio, dst_clu);
+	init_pio(ploop, REQ_OP_WRITE, aux_pio);
+	pio_prepare_offsets(ploop, aux_pio, dst_clu);
 
 	BUG_ON(irqs_disabled());
-	pio->endio_cb = ploop_cow_endio;
-	pio->endio_cb_data = cow;
+	aux_pio->endio_cb = ploop_cow_endio;
+	aux_pio->endio_cb_data = cow;
 
-	map_and_submit_rw(ploop, dst_clu, pio, top_level(ploop));
+	map_and_submit_rw(ploop, dst_clu, aux_pio, top_level(ploop));
 	return;
 error:
 	complete_cow(cow, BLK_STS_IOERR);