From: Mike Snitzer <snitzer@xxxxxxxxxx>
Rename submit_flush_vio() to vdo_submit_flush_vio().
Reviewed-by: Susan LeGendre-McGhee <slegendr@xxxxxxxxxx>
Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>
Signed-off-by: Matthew Sakai <msakai@xxxxxxxxxx>
---
drivers/md/dm-vdo/block-map.c | 2 +-
drivers/md/dm-vdo/io-submitter.h | 4 ++--
drivers/md/dm-vdo/recovery-journal.c | 2 +-
drivers/md/dm-vdo/slab-depot.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/md/dm-vdo/block-map.c b/drivers/md/dm-vdo/block-map.c
index 0df1517294e1..1edb3b2a80eb 100644
--- a/drivers/md/dm-vdo/block-map.c
+++ b/drivers/md/dm-vdo/block-map.c
@@ -835,7 +835,7 @@ static void save_pages(struct vdo_page_cache *cache)
* successfully persisted, and thus must issue a flush before each batch of pages is
* written to ensure this.
*/
- submit_flush_vio(vio, flush_endio, handle_flush_error);
+ vdo_submit_flush_vio(vio, flush_endio, handle_flush_error);
}
/**
diff --git a/drivers/md/dm-vdo/io-submitter.h b/drivers/md/dm-vdo/io-submitter.h
index 9e97cfc91bee..77b8df6d559e 100644
--- a/drivers/md/dm-vdo/io-submitter.h
+++ b/drivers/md/dm-vdo/io-submitter.h
@@ -36,8 +36,8 @@ static inline void vdo_submit_metadata_vio(struct vio *vio, physical_block_numbe
operation, vio->data);
}
-static inline void submit_flush_vio(struct vio *vio, bio_end_io_t callback,
- vdo_action_fn error_handler)
+static inline void vdo_submit_flush_vio(struct vio *vio, bio_end_io_t callback,
+ vdo_action_fn error_handler)
{
/* FIXME: Can we just use REQ_OP_FLUSH? */
__submit_metadata_vio(vio, 0, callback, error_handler,
diff --git a/drivers/md/dm-vdo/recovery-journal.c b/drivers/md/dm-vdo/recovery-journal.c
index 55411eff5bd7..2dfc39deef94 100644
--- a/drivers/md/dm-vdo/recovery-journal.c
+++ b/drivers/md/dm-vdo/recovery-journal.c
@@ -1541,7 +1541,7 @@ static void reap_recovery_journal(struct recovery_journal *journal)
* summary update covering the slab journal that just released some lock.
*/
journal->reaping = true;
- submit_flush_vio(journal->flush_vio, flush_endio, handle_flush_error);
+ vdo_submit_flush_vio(journal->flush_vio, flush_endio, handle_flush_error);
}
/**
diff --git a/drivers/md/dm-vdo/slab-depot.c b/drivers/md/dm-vdo/slab-depot.c
index 5fc4a1cdfafc..670a464ddbb0 100644
--- a/drivers/md/dm-vdo/slab-depot.c
+++ b/drivers/md/dm-vdo/slab-depot.c
@@ -449,7 +449,7 @@ static void flush_for_reaping(struct waiter *waiter, void *context)
struct vio *vio = &pooled->vio;
vio->completion.parent = journal;
- submit_flush_vio(vio, flush_endio, handle_flush_error);
+ vdo_submit_flush_vio(vio, flush_endio, handle_flush_error);
}
/**
--
2.40.0
