Commit 6bda1072 authored by Mike Snitzer's avatar Mike Snitzer

dm vdo block-map: fix a few small nits

Rename 'pages' to 'num_pages' in distribute_page_over_waitq().
Update assert message in validate_completed_page() to model others.
Tweak line-wrapping on a comment that was needlessly long.
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
Signed-off-by: default avatarMatthew Sakai <msakai@redhat.com>
parent f36b1d3b
...@@ -535,19 +535,19 @@ static void complete_waiter_with_page(struct vdo_waiter *waiter, void *page_info ...@@ -535,19 +535,19 @@ static void complete_waiter_with_page(struct vdo_waiter *waiter, void *page_info
static unsigned int distribute_page_over_waitq(struct page_info *info, static unsigned int distribute_page_over_waitq(struct page_info *info,
struct vdo_wait_queue *waitq) struct vdo_wait_queue *waitq)
{ {
size_t pages; size_t num_pages;
update_lru(info); update_lru(info);
pages = vdo_waitq_num_waiters(waitq); num_pages = vdo_waitq_num_waiters(waitq);
/* /*
* Increment the busy count once for each pending completion so that this page does not * Increment the busy count once for each pending completion so that this page does not
* stop being busy until all completions have been processed (VDO-83). * stop being busy until all completions have been processed (VDO-83).
*/ */
info->busy += pages; info->busy += num_pages;
vdo_waitq_notify_all_waiters(waitq, complete_waiter_with_page, info); vdo_waitq_notify_all_waiters(waitq, complete_waiter_with_page, info);
return pages; return num_pages;
} }
/** /**
...@@ -614,7 +614,8 @@ static int __must_check validate_completed_page(struct vdo_page_completion *comp ...@@ -614,7 +614,8 @@ static int __must_check validate_completed_page(struct vdo_page_completion *comp
return result; return result;
if (writable) { if (writable) {
result = ASSERT(completion->writable, "VDO Page Completion is writable"); result = ASSERT(completion->writable,
"VDO Page Completion must be writable");
if (result != UDS_SUCCESS) if (result != UDS_SUCCESS)
return result; return result;
} }
...@@ -741,8 +742,8 @@ static void handle_rebuild_read_error(struct vdo_completion *completion) ...@@ -741,8 +742,8 @@ static void handle_rebuild_read_error(struct vdo_completion *completion)
assert_on_cache_thread(cache, __func__); assert_on_cache_thread(cache, __func__);
/* /*
* We are doing a read-only rebuild, so treat this as a successful read of an uninitialized * We are doing a read-only rebuild, so treat this as a successful read
* page. * of an uninitialized page.
*/ */
vio_record_metadata_io_error(as_vio(completion)); vio_record_metadata_io_error(as_vio(completion));
ADD_ONCE(cache->stats.failed_reads, 1); ADD_ONCE(cache->stats.failed_reads, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment