[Devel] [PATCH RHEL8 COMMIT] ploop: Rename delayed_pios into suspended_pios

Konstantin Khorenko khorenko at virtuozzo.com
Thu Jun 17 19:03:22 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.44
------>
commit 90837011801fc6dd290559305b363cebad103df3
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Thu Jun 17 19:03:21 2021 +0300

    ploop: Rename delayed_pios into suspended_pios
    
    No functional changes.
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
    
    =====================
    Patchset description:
    
    ploop: Freeze WRITE on -ENOSPC on host
    
    Suspend WRITEs in case of host's fs returns -ENOSPC.
    
    https://jira.sw.ru/browse/PSBM-127225
    
    Kirill Tkhai (5):
          ploop: Add check of htable is empty on .dtr
          ploop: Rename delayed_pios into suspended_pios
          ploop: Remove unused define and comment
          ploop: Close race in ploop_flip_upper_deltas()
          ploop: Freeze on ENOSPC and notify userspace via dm event
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 drivers/md/dm-ploop-cmd.c    | 2 +-
 drivers/md/dm-ploop-map.c    | 2 +-
 drivers/md/dm-ploop-target.c | 2 +-
 drivers/md/dm-ploop.h        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/md/dm-ploop-cmd.c b/drivers/md/dm-ploop-cmd.c
index e668a5b902d2..38b0ad40815e 100644
--- a/drivers/md/dm-ploop-cmd.c
+++ b/drivers/md/dm-ploop-cmd.c
@@ -139,7 +139,7 @@ static void ploop_resume_submitting_pios(struct ploop *ploop)
 	spin_lock_irq(&ploop->deferred_lock);
 	WARN_ON_ONCE(!ploop->stop_submitting_pios);
 	ploop->stop_submitting_pios = false;
-	list_splice_tail_init(&ploop->delayed_pios, &list);
+	list_splice_tail_init(&ploop->suspended_pios, &list);
 	spin_unlock_irq(&ploop->deferred_lock);
 
 	submit_pios(ploop, &list);
diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c
index 6ba547626b20..6361c770d193 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -1634,7 +1634,7 @@ static void submit_pio(struct ploop *ploop, struct pio *pio)
 
 	spin_lock_irqsave(&ploop->deferred_lock, flags);
 	if (unlikely(ploop->stop_submitting_pios)) {
-		list_splice_tail(&list, &ploop->delayed_pios);
+		list_splice_tail(&list, &ploop->suspended_pios);
 		queue = false;
 		goto unlock;
 	}
diff --git a/drivers/md/dm-ploop-target.c b/drivers/md/dm-ploop-target.c
index 59f4d886b938..848e099d03a7 100644
--- a/drivers/md/dm-ploop-target.c
+++ b/drivers/md/dm-ploop-target.c
@@ -316,7 +316,7 @@ static int ploop_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 	spin_lock_init(&ploop->inflight_lock);
 	spin_lock_init(&ploop->deferred_lock);
 
-	INIT_LIST_HEAD(&ploop->delayed_pios);
+	INIT_LIST_HEAD(&ploop->suspended_pios);
 	INIT_LIST_HEAD(&ploop->deferred_pios);
 	INIT_LIST_HEAD(&ploop->flush_pios);
 	INIT_LIST_HEAD(&ploop->discard_pios);
diff --git a/drivers/md/dm-ploop.h b/drivers/md/dm-ploop.h
index fe387c981c2c..72628756412e 100644
--- a/drivers/md/dm-ploop.h
+++ b/drivers/md/dm-ploop.h
@@ -162,7 +162,7 @@ struct ploop {
 	bool inflight_ref_comp_pending;
 	unsigned int inflight_bios_ref_index:1;
 
-	struct list_head delayed_pios;
+	struct list_head suspended_pios;
 	bool stop_submitting_pios;
 
 	spinlock_t inflight_lock;


More information about the Devel mailing list