[Devel] [PATCH RHEL8 COMMIT] ploop: Rename converted functions

Konstantin Khorenko khorenko at virtuozzo.com
Mon May 17 19:04:48 MSK 2021


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.30
------>
commit 1c34e02024838c8bea5c9cbf339c8f0023f2eed8
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Mon May 17 19:04:48 2021 +0300

    ploop: Rename converted functions
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
    
    =====================
    Patchset description:
    
    dm-ploop: Kill loop
    
    Intermediate patches can't be base for bisect.
    
    In scope of https://jira.sw.ru/browse/PSBM-123654
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 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 3c9869bd964e..5fbc10d0f99c 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -375,7 +375,7 @@ static void del_cluster_lk(struct ploop *ploop, struct pio *h)
 
 }
 
-static void maybe_link_submitting_bio(struct ploop *ploop, struct pio *h,
+static void maybe_link_submitting_pio(struct ploop *ploop, struct pio *h,
 				      unsigned int cluster)
 {
 	unsigned long flags;
@@ -409,7 +409,7 @@ static void maybe_unlink_completed_bio(struct ploop *ploop, struct bio *bio)
 		queue_work(ploop->wq, &ploop->worker);
 }
 
-static bool bio_endio_if_all_zeros(struct pio *pio)
+static bool pio_endio_if_all_zeros(struct pio *pio)
 {
 	struct bvec_iter bi = {
 		.bi_size = pio->bi_iter.bi_size,
@@ -1241,7 +1241,7 @@ static void process_delta_wb(struct ploop *ploop, struct ploop_index_wb *piwb)
  * Note: cluster newer becomes locked here, since index update is called
  * synchronously. Keep in mind this in case you make it async.
  */
-static bool locate_new_cluster_and_attach_bio(struct ploop *ploop,
+static bool locate_new_cluster_and_attach_pio(struct ploop *ploop,
 					      struct ploop_index_wb *piwb,
 					      unsigned int cluster,
 					      unsigned int *dst_cluster,
@@ -1371,11 +1371,11 @@ static int process_one_deferred_bio(struct ploop *ploop, struct pio *pio,
 		goto out;
 	}
 
-	if (unlikely(bio_endio_if_all_zeros(pio)))
+	if (unlikely(pio_endio_if_all_zeros(pio)))
 		goto out;
 
 	/* Cluster exists nowhere. Allocate it and setup pio as outrunning */
-	ret = locate_new_cluster_and_attach_bio(ploop, piwb, cluster,
+	ret = locate_new_cluster_and_attach_pio(ploop, piwb, cluster,
 						&dst_cluster, pio);
 	if (!ret)
 		goto out;
@@ -1385,7 +1385,7 @@ static int process_one_deferred_bio(struct ploop *ploop, struct pio *pio,
 	inc_nr_inflight(ploop, pio);
 	read_unlock_irq(&ploop->bat_rwlock);
 
-	maybe_link_submitting_bio(ploop, pio, cluster);
+	maybe_link_submitting_pio(ploop, pio, cluster);
 
 	submit_rw_mapped(ploop, dst_cluster, pio);
 out:


More information about the Devel mailing list