From: Mike Snitzer <snitzer@xxxxxxxxxx> Rename process_vio_io() to vdo_submit_vio(), and process_data_vio_io() to submit_data_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/dedupe.c | 2 +- drivers/md/dm-vdo/io-submitter.c | 16 ++++++++-------- drivers/md/dm-vdo/io-submitter.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/md/dm-vdo/dedupe.c b/drivers/md/dm-vdo/dedupe.c index 4c4d697a4888..8cc31110f5a8 100644 --- a/drivers/md/dm-vdo/dedupe.c +++ b/drivers/md/dm-vdo/dedupe.c @@ -1205,7 +1205,7 @@ static void start_verifying(struct hash_lock *lock, struct data_vio *agent) return; } - set_data_vio_bio_zone_callback(agent, process_vio_io); + set_data_vio_bio_zone_callback(agent, vdo_submit_vio); vdo_launch_completion_with_priority(&vio->completion, BIO_Q_VERIFY_PRIORITY); } diff --git a/drivers/md/dm-vdo/io-submitter.c b/drivers/md/dm-vdo/io-submitter.c index 1dd670bb0a74..39f5f202d69d 100644 --- a/drivers/md/dm-vdo/io-submitter.c +++ b/drivers/md/dm-vdo/io-submitter.c @@ -116,10 +116,10 @@ static void send_bio_to_device(struct vio *vio, struct bio *bio) } /** - * process_vio_io() - Submits a vio's bio to the underlying block device. May block if the device - * is busy. This callback should be used by vios which did not attempt to merge. + * vdo_submit_vio() - Submits a vio's bio to the underlying block device. May block if the device + * is busy. This callback should be used by vios which did not attempt to merge. */ -void process_vio_io(struct vdo_completion *completion) +void vdo_submit_vio(struct vdo_completion *completion) { struct vio *vio = as_vio(completion); @@ -156,12 +156,12 @@ static struct bio *get_bio_list(struct vio *vio) } /** - * process_data_vio_io() - Submit a data_vio's bio to the storage below along with any bios that - * have been merged with it. + * submit_data_vio() - Submit a data_vio's bio to the storage below along with + * any bios that have been merged with it. * * Context: This call may block and so should only be called from a bio thread. */ -static void process_data_vio_io(struct vdo_completion *completion) +static void submit_data_vio(struct vdo_completion *completion) { struct bio *bio, *next; struct vio *vio = as_vio(completion); @@ -316,7 +316,7 @@ void vdo_submit_data_vio(struct data_vio *data_vio) if (try_bio_map_merge(&data_vio->vio)) return; - launch_data_vio_bio_zone_callback(data_vio, process_data_vio_io); + launch_data_vio_bio_zone_callback(data_vio, submit_data_vio); } /** @@ -356,7 +356,7 @@ void __submit_metadata_vio(struct vio *vio, physical_block_number_t physical, return; } - vdo_set_completion_callback(completion, process_vio_io, + vdo_set_completion_callback(completion, vdo_submit_vio, get_vio_bio_zone_thread_id(vio)); vdo_launch_completion_with_priority(completion, get_metadata_priority(vio)); } diff --git a/drivers/md/dm-vdo/io-submitter.h b/drivers/md/dm-vdo/io-submitter.h index 57e1074a65a4..ddd5f4b391b6 100644 --- a/drivers/md/dm-vdo/io-submitter.h +++ b/drivers/md/dm-vdo/io-submitter.h @@ -20,7 +20,7 @@ void vdo_cleanup_io_submitter(struct io_submitter *io_submitter); void vdo_free_io_submitter(struct io_submitter *io_submitter); -void process_vio_io(struct vdo_completion *completion); +void vdo_submit_vio(struct vdo_completion *completion); void vdo_submit_data_vio(struct data_vio *data_vio); -- 2.40.0