[rh7,2/4] ploop: Rename fast_path_waitq into pending_waitq

Submitted by Kirill Tkhai on March 5, 2020, 12:46 p.m.

Details

Message ID 158341239588.293365.13802654576305196500.stgit@localhost.localdomain
State New
Series "ploop: Be over protectable on discard"
Headers show

Commit Message

Kirill Tkhai March 5, 2020, 12:46 p.m.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 drivers/block/ploop/dev.c   |    8 ++++----
 include/linux/ploop/ploop.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/block/ploop/dev.c b/drivers/block/ploop/dev.c
index 67cc9e46c4cb..1262697d0e95 100644
--- a/drivers/block/ploop/dev.c
+++ b/drivers/block/ploop/dev.c
@@ -177,7 +177,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)
@@ -673,8 +673,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);
@@ -5495,7 +5495,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 50ee95ab623d..0b8687944362 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;