[RHEL8,COMMIT] ploop: Move struct ploop_cow definition

Submitted by Konstantin Khorenko on Dec. 10, 2019, 3:33 p.m.

Details

Message ID 201912101533.xBAFXDgt024012@finist_co8.work.ct
State New
Series "ploop: Move struct ploop_cow definition"
Headers show

Commit Message

Konstantin Khorenko Dec. 10, 2019, 3:33 p.m.
The commit is pushed to "branch-rh8-4.18.0-80.1.2.vz8.2.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-80.1.2.vz8.2.6
------>
commit dbe3598de1b5104c8f490805b955a7e33a216eca
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Tue Dec 10 18:33:13 2019 +0300

    ploop: Move struct ploop_cow definition
    
    Also add comment about member "data".
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 drivers/md/dm-ploop-map.c | 12 ------------
 drivers/md/dm-ploop.h     | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c
index e6dcd0c8a530..27ad48c5e16a 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -48,18 +48,6 @@ 
 			read_unlock_irqrestore(&ploop->bat_rwlock, flags);	\
 	} while (0)
 
-/* Delta COW private */
-struct ploop_cow {
-	struct ploop *ploop;
-	struct bio *cluster_bio;
-	unsigned int dst_cluster;
-
-	struct dm_ploop_endio_hook hook;
-
-	void (*end_fn)(struct ploop *, int, void *);
-	void *data;
-};
-
 static void ploop_index_wb_init(struct ploop_index_wb *piwb, struct ploop *ploop)
 {
 	piwb->ploop = ploop;
diff --git a/drivers/md/dm-ploop.h b/drivers/md/dm-ploop.h
index 12c946030905..0571e8fe0e79 100644
--- a/drivers/md/dm-ploop.h
+++ b/drivers/md/dm-ploop.h
@@ -260,6 +260,18 @@  struct ploop_iocb {
 	atomic_t count;
 };
 
+/* Delta COW private */
+struct ploop_cow {
+	struct ploop *ploop;
+	struct bio *cluster_bio;
+	unsigned int dst_cluster;
+
+	struct dm_ploop_endio_hook hook;
+
+	void (*end_fn)(struct ploop *, int, void *);
+	void *data; /* Second argument of end_fn */
+};
+
 extern struct kmem_cache *piocb_cache;
 
 static inline bool ploop_is_ro(struct ploop *ploop)