[Devel] [PATCH RHEL7 COMMIT] ploop: Rename fast_path_waitq into pending_waitq

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-1062.12.1.vz7.145.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.12.1.vz7.131.8
------>
commit 421167dd5f79b5a57b53435197f907ec1ef11788
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Fri Mar 6 13:55:47 2020 +0300

    ploop: Rename fast_path_waitq into pending_waitq
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
    
    =====================
    Patchset description:
    
    ploop: Be over protectable on discard
    
    Forcedly wait and disable discard on snapshot and grow.
    
    Kirill Tkhai (4):
          ploop: Simplify check in ploop_fast_end_io()
          ploop: Rename fast_path_waitq into pending_waitq
          ploop: Rename bio_discard_inflight_reqs into discard_inflight_reqs
          ploop: Be overprotective on discard
---
 drivers/block/ploop/dev.c   | 8 ++++----
 include/linux/ploop/ploop.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/block/ploop/dev.c b/drivers/block/ploop/dev.c
index 7ef4432a0082b..833b472201175 100644
--- a/drivers/block/ploop/dev.c
+++ b/drivers/block/ploop/dev.c
@@ -178,7 +178,7 @@ static int fast_path_reqs_count(struct ploop_device *plo)
 
 static void wait_fast_path_reqs(struct ploop_device *plo)
 {
-	wait_event(plo->fast_path_waitq, fast_path_reqs_count(plo) == 0);
+	wait_event(plo->pending_waitq, fast_path_reqs_count(plo) == 0);
 }
 
 static void ploop_init_request(struct ploop_request *preq)
@@ -674,8 +674,8 @@ DEFINE_BIO_CB(ploop_fast_end_io)
 	     !list_empty(&plo->entry_queue)))
 		wake_up_interruptible(&plo->waitq);
 	if (!plo->fastpath_reqs &&
-	    waitqueue_active(&plo->fast_path_waitq))
-		wake_up(&plo->fast_path_waitq);
+	    waitqueue_active(&plo->pending_waitq))
+		wake_up(&plo->pending_waitq);
 	spin_unlock_irqrestore(&plo->lock, flags);
 
 	BIO_ENDIO(plo->queue, orig, err);
@@ -5496,7 +5496,7 @@ static struct ploop_device *__ploop_dev_alloc(int index)
 	init_waitqueue_head(&plo->req_waitq);
 	init_waitqueue_head(&plo->freeze_waitq);
 	init_waitqueue_head(&plo->event_waitq);
-	init_waitqueue_head(&plo->fast_path_waitq);
+	init_waitqueue_head(&plo->pending_waitq);
 	plo->tune = DEFAULT_PLOOP_TUNE;
 	map_init(plo, &plo->map);
 	track_init(plo);
diff --git a/include/linux/ploop/ploop.h b/include/linux/ploop/ploop.h
index 50ee95ab623d3..0b86879443629 100644
--- a/include/linux/ploop/ploop.h
+++ b/include/linux/ploop/ploop.h
@@ -408,7 +408,7 @@ struct ploop_device
 	wait_queue_head_t	req_waitq;
 	wait_queue_head_t	freeze_waitq;
 	wait_queue_head_t	event_waitq;
-	wait_queue_head_t	fast_path_waitq;
+	wait_queue_head_t	pending_waitq;
 
 	struct ploop_map	map;
 	struct ploop_map	*trans_map;