[Devel] [PATCH RHEL9 COMMIT] 111 dm-qcow2: Rename MERGE_QIOS_MAX

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.0-42.vz9.14.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-42.vz9.14.4
------>
commit 89545d8ed1081f53d5cade5089dfe32ceb3a6a44
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Wed Mar 23 22:14:27 2022 +0300

    dm-qcow2: Rename MERGE_QIOS_MAX
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
    Feature: dm-qcow2: block device over QCOW2 files driver
---
 drivers/md/dm-qcow2-cmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/md/dm-qcow2-cmd.c b/drivers/md/dm-qcow2-cmd.c
index 1db79f6e54e7..ff7b38d0a943 100644
--- a/drivers/md/dm-qcow2-cmd.c
+++ b/drivers/md/dm-qcow2-cmd.c
@@ -7,7 +7,7 @@
 #include <linux/file.h>
 #include "dm-qcow2.h"
 
-#define MERGE_QIOS_MAX 64
+#define SERVICE_QIOS_MAX 64
 
 static int qcow2_get_errors(struct qcow2_target *tgt, char *result,
 			    unsigned int maxlen)
@@ -86,9 +86,9 @@ static int qcow2_service_iter(struct qcow2_target *tgt, struct qcow2 *qcow2,
 		qio->endio_cb_data = &service_status;
 
 		dispatch_qios(qcow2, qio, NULL);
-		if (atomic_inc_return(&tgt->service_qios) == MERGE_QIOS_MAX) {
+		if (atomic_inc_return(&tgt->service_qios) == SERVICE_QIOS_MAX) {
 			wait_event(tgt->service_wq,
-				   atomic_read(&tgt->service_qios) < MERGE_QIOS_MAX);
+				   atomic_read(&tgt->service_qios) < SERVICE_QIOS_MAX);
 		}
 
 		if (unlikely(READ_ONCE(service_status)))