[PATCH 0/5] dm vdo: fix various small nits

[PATCH 0/5] dm vdo: fix various small nits

[Matthew Sakai]

Mike Snitzer (5):
  dm vdo string-utils: remove unnecessary includes
  dm vdo dedupe: fix various small nits
  dm vdo: cleanup style for comments in structs
  dm vdo chapter_index: fix a few small nits
  dm vdo delta-index: fix various small nits

 drivers/md/dm-vdo/block-map.h        |  12 +-
 drivers/md/dm-vdo/chapter-index.c    |   9 +-
 drivers/md/dm-vdo/constants.h        |  38 +++---
 drivers/md/dm-vdo/dedupe.c           |  11 +-
 drivers/md/dm-vdo/delta-index.c      |  23 ++--
 drivers/md/dm-vdo/delta-index.h      |   2 +-
 drivers/md/dm-vdo/encodings.h        |   8 +-
 drivers/md/dm-vdo/flush.c            |  28 ++--
 drivers/md/dm-vdo/recovery-journal.h |  22 +--
 drivers/md/dm-vdo/statistics.h       | 194 +++++++++++++--------------
 drivers/md/dm-vdo/string-utils.c     |   6 -
 drivers/md/dm-vdo/vdo.h              |   8 +-
 drivers/md/dm-vdo/vio.c              |  16 +--
 13 files changed, 186 insertions(+), 191 deletions(-)

-- 
2.42.0

[PATCH 1/5] dm vdo string-utils: remove unnecessary includes

[Matthew Sakai]

From: Mike Snitzer <snitzer@kernel.org>

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Susan LeGendre-McGhee <slegendr@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
---
 drivers/md/dm-vdo/string-utils.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/md/dm-vdo/string-utils.c b/drivers/md/dm-vdo/string-utils.c
index a584b37bb70c..6cdf018cdaf0 100644
--- a/drivers/md/dm-vdo/string-utils.c
+++ b/drivers/md/dm-vdo/string-utils.c
@@ -5,12 +5,6 @@
 
 #include "string-utils.h"
 
-#include "errors.h"
-#include "logger.h"
-#include "memory-alloc.h"
-#include "permassert.h"
-#include "uds.h"
-
 char *uds_append_to_buffer(char *buffer, char *buf_end, const char *fmt, ...)
 {
 	va_list args;
-- 
2.42.0

[PATCH 2/5] dm vdo dedupe: fix various small nits

[Matthew Sakai]

From: Mike Snitzer <snitzer@kernel.org>

Add a __must_hold sparse annotation to launch_dedupe_state_change that
reflects its ASSERTION code comments about locking requirements, add
some extra braces and fix a couple typos.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Susan LeGendre-McGhee <slegendr@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
---
 drivers/md/dm-vdo/dedupe.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/md/dm-vdo/dedupe.c b/drivers/md/dm-vdo/dedupe.c
index d81065a0951c..2a1902c4423c 100644
--- a/drivers/md/dm-vdo/dedupe.c
+++ b/drivers/md/dm-vdo/dedupe.c
@@ -81,7 +81,7 @@
  *
  * A query to the UDS index is handled asynchronously by the index's threads. When the query is
  * complete, a callback supplied with the query will be called from one of the those threads. Under
- * heavy system load, the index may be slower to respond then is desirable for reasonable I/O
+ * heavy system load, the index may be slower to respond than is desirable for reasonable I/O
  * throughput. Since deduplication of writes is not necessary for correct operation of a VDO
  * device, it is acceptable to timeout out slow index queries and proceed to fulfill a write
  * request without deduplicating. However, because the uds_request struct itself is supplied by the
@@ -1311,7 +1311,7 @@ static bool acquire_provisional_reference(struct data_vio *agent, struct pbn_loc
  *              behalf of its hash lock.
  *
  * If the PBN is already locked for writing, the lock attempt is abandoned and is_duplicate will be
- * cleared before calling back. this continuation is launched from start_locking(), and calls back
+ * cleared before calling back. This continuation is launched from start_locking(), and calls back
  * to finish_locking() on the hash zone thread.
  */
 static void lock_duplicate_pbn(struct vdo_completion *completion)
@@ -2300,9 +2300,10 @@ static void finish_index_operation(struct uds_request *request)
 	 * data_vio has already moved on.
 	 */
 	if (!change_context_state(context, DEDUPE_CONTEXT_TIMED_OUT,
-				  DEDUPE_CONTEXT_TIMED_OUT_COMPLETE))
+				  DEDUPE_CONTEXT_TIMED_OUT_COMPLETE)) {
 		ASSERT_LOG_ONLY(false, "uds request was timed out (state %d)",
 				atomic_read(&context->state));
+	}
 
 	uds_funnel_queue_put(context->zone->timed_out_complete, &context->queue_entry);
 }
@@ -2616,6 +2617,7 @@ void vdo_drain_hash_zones(struct hash_zones *zones, struct vdo_completion *paren
 }
 
 static void launch_dedupe_state_change(struct hash_zones *zones)
+	__must_hold(&zones->lock)
 {
 	/* ASSERTION: We enter with the lock held. */
 	if (zones->changing || !vdo_is_state_normal(&zones->state))
@@ -3056,9 +3058,10 @@ int vdo_add_dedupe_index_sysfs(struct hash_zones *zones)
 	int result = kobject_add(&zones->dedupe_directory,
 				 &zones->completion.vdo->vdo_directory, "dedupe");
 
-	if (result == 0)
+	if (result == 0) {
 		vdo_set_admin_state_code(&zones->state,
 					 VDO_ADMIN_STATE_NORMAL_OPERATION);
+	}
 
 	return result;
 }
-- 
2.42.0

[PATCH 3/5] dm vdo: cleanup style for comments in structs

[Matthew Sakai]

From: Mike Snitzer <snitzer@kernel.org>

Use /* ... */ rather than /** ... */ if for no other reason than
syntax highlighting is improved (at least for me, in emacs: comments
are now red, code is yellow. Previously comments were also yellow).

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Susan LeGendre-McGhee <slegendr@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
---
 drivers/md/dm-vdo/block-map.h        |  12 +-
 drivers/md/dm-vdo/constants.h        |  38 +++---
 drivers/md/dm-vdo/encodings.h        |   8 +-
 drivers/md/dm-vdo/flush.c            |  28 ++--
 drivers/md/dm-vdo/recovery-journal.h |  22 +--
 drivers/md/dm-vdo/statistics.h       | 194 +++++++++++++--------------
 drivers/md/dm-vdo/vdo.h              |   8 +-
 drivers/md/dm-vdo/vio.c              |  16 +--
 8 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/drivers/md/dm-vdo/block-map.h b/drivers/md/dm-vdo/block-map.h
index b662c318c2ea..39a13039e4a3 100644
--- a/drivers/md/dm-vdo/block-map.h
+++ b/drivers/md/dm-vdo/block-map.h
@@ -216,17 +216,17 @@ enum block_map_page_type {
 typedef struct list_head dirty_era_t[2];
 
 struct dirty_lists {
-	/** The number of periods after which an element will be expired */
+	/* The number of periods after which an element will be expired */
 	block_count_t maximum_age;
-	/** The oldest period which has unexpired elements */
+	/* The oldest period which has unexpired elements */
 	sequence_number_t oldest_period;
-	/** One more than the current period */
+	/* One more than the current period */
 	sequence_number_t next_period;
-	/** The offset in the array of lists of the oldest period */
+	/* The offset in the array of lists of the oldest period */
 	block_count_t offset;
-	/** Expired pages */
+	/* Expired pages */
 	dirty_era_t expired;
-	/** The lists of dirty pages */
+	/* The lists of dirty pages */
 	dirty_era_t eras[];
 };
 
diff --git a/drivers/md/dm-vdo/constants.h b/drivers/md/dm-vdo/constants.h
index 24237bc29f87..a8c4d6e24b38 100644
--- a/drivers/md/dm-vdo/constants.h
+++ b/drivers/md/dm-vdo/constants.h
@@ -17,10 +17,10 @@ enum {
 	 */
 	VDO_BIO_ROTATION_INTERVAL_LIMIT = 1024,
 
-	/** The number of entries on a block map page */
+	/* The number of entries on a block map page */
 	VDO_BLOCK_MAP_ENTRIES_PER_PAGE = 812,
 
-	/** The origin of the flat portion of the block map */
+	/* The origin of the flat portion of the block map */
 	VDO_BLOCK_MAP_FLAT_PAGE_ORIGIN = 1,
 
 	/*
@@ -29,22 +29,22 @@ enum {
 	 */
 	VDO_BLOCK_MAP_TREE_HEIGHT = 5,
 
-	/** The default number of bio submission queues. */
+	/* The default number of bio submission queues. */
 	DEFAULT_VDO_BIO_SUBMIT_QUEUE_COUNT = 4,
 
-	/** The number of contiguous PBNs to be submitted to a single bio queue. */
+	/* The number of contiguous PBNs to be submitted to a single bio queue. */
 	DEFAULT_VDO_BIO_SUBMIT_QUEUE_ROTATE_INTERVAL = 64,
 
-	/** The number of trees in the arboreal block map */
+	/* The number of trees in the arboreal block map */
 	DEFAULT_VDO_BLOCK_MAP_TREE_ROOT_COUNT = 60,
 
-	/** The default size of the recovery journal, in blocks */
+	/* The default size of the recovery journal, in blocks */
 	DEFAULT_VDO_RECOVERY_JOURNAL_SIZE = 32 * 1024,
 
-	/** The default size of each slab journal, in blocks */
+	/* The default size of each slab journal, in blocks */
 	DEFAULT_VDO_SLAB_JOURNAL_SIZE = 224,
 
-	/** Unit test minimum */
+	/* Unit test minimum */
 	MINIMUM_VDO_SLAB_JOURNAL_BLOCKS = 2,
 
 	/*
@@ -54,16 +54,16 @@ enum {
 	 */
 	VDO_LOCK_MAP_CAPACITY = 10000,
 
-	/** The maximum number of logical zones */
+	/* The maximum number of logical zones */
 	MAX_VDO_LOGICAL_ZONES = 60,
 
-	/** The maximum number of physical zones */
+	/* The maximum number of physical zones */
 	MAX_VDO_PHYSICAL_ZONES = 16,
 
-	/** The base-2 logarithm of the maximum blocks in one slab */
+	/* The base-2 logarithm of the maximum blocks in one slab */
 	MAX_VDO_SLAB_BITS = 23,
 
-	/** The maximum number of slabs the slab depot supports */
+	/* The maximum number of slabs the slab depot supports */
 	MAX_VDO_SLABS = 8192,
 
 	/*
@@ -71,25 +71,25 @@ enum {
 	 */
 	MAXIMUM_SIMULTANEOUS_VDO_BLOCK_MAP_RESTORATION_READS = 1024,
 
-	/** The maximum number of entries in the slab summary */
+	/* The maximum number of entries in the slab summary */
 	MAXIMUM_VDO_SLAB_SUMMARY_ENTRIES = MAX_VDO_SLABS * MAX_VDO_PHYSICAL_ZONES,
 
-	/** The maximum number of total threads in a VDO thread configuration. */
+	/* The maximum number of total threads in a VDO thread configuration. */
 	MAXIMUM_VDO_THREADS = 100,
 
-	/** The maximum number of VIOs in the system at once */
+	/* The maximum number of VIOs in the system at once */
 	MAXIMUM_VDO_USER_VIOS = 2048,
 
-	/** The only physical block size supported by VDO */
+	/* The only physical block size supported by VDO */
 	VDO_BLOCK_SIZE = 4096,
 
-	/** The number of sectors per block */
+	/* The number of sectors per block */
 	VDO_SECTORS_PER_BLOCK = (VDO_BLOCK_SIZE >> SECTOR_SHIFT),
 
-	/** The size of a sector that will not be torn */
+	/* The size of a sector that will not be torn */
 	VDO_SECTOR_SIZE = 512,
 
-	/** The physical block number reserved for storing the zero block */
+	/* The physical block number reserved for storing the zero block */
 	VDO_ZERO_BLOCK = 0,
 };
 
diff --git a/drivers/md/dm-vdo/encodings.h b/drivers/md/dm-vdo/encodings.h
index 260822a3958a..ba3db9867f4a 100644
--- a/drivers/md/dm-vdo/encodings.h
+++ b/drivers/md/dm-vdo/encodings.h
@@ -155,7 +155,7 @@ struct block_map_page_header {
 	__le64 nonce;
 	__le64 pbn;
 
-	/** May be non-zero on disk */
+	/* May be non-zero on disk */
 	u8 unused_long_word[8];
 
 	/* Whether this page has been written twice to disk */
@@ -197,11 +197,11 @@ extern const struct header VDO_BLOCK_MAP_HEADER_2_0;
 
 /* The state of the recovery journal as encoded in the VDO super block. */
 struct recovery_journal_state_7_0 {
-	/** Sequence number to start the journal */
+	/* Sequence number to start the journal */
 	sequence_number_t journal_start;
-	/** Number of logical blocks used by VDO */
+	/* Number of logical blocks used by VDO */
 	block_count_t logical_blocks_used;
-	/** Number of block map pages allocated */
+	/* Number of block map pages allocated */
 	block_count_t block_map_data_blocks;
 } __packed;
 
diff --git a/drivers/md/dm-vdo/flush.c b/drivers/md/dm-vdo/flush.c
index a6eeb425d721..330b18715027 100644
--- a/drivers/md/dm-vdo/flush.c
+++ b/drivers/md/dm-vdo/flush.c
@@ -22,33 +22,33 @@
 
 struct flusher {
 	struct vdo_completion completion;
-	/** The vdo to which this flusher belongs */
+	/* The vdo to which this flusher belongs */
 	struct vdo *vdo;
-	/** The administrative state of the flusher */
+	/* The administrative state of the flusher */
 	struct admin_state state;
-	/** The current flush generation of the vdo */
+	/* The current flush generation of the vdo */
 	sequence_number_t flush_generation;
-	/** The first unacknowledged flush generation */
+	/* The first unacknowledged flush generation */
 	sequence_number_t first_unacknowledged_generation;
-	/** The queue of flush requests waiting to notify other threads */
+	/* The queue of flush requests waiting to notify other threads */
 	struct vdo_wait_queue notifiers;
-	/** The queue of flush requests waiting for VIOs to complete */
+	/* The queue of flush requests waiting for VIOs to complete */
 	struct vdo_wait_queue pending_flushes;
-	/** The flush generation for which notifications are being sent */
+	/* The flush generation for which notifications are being sent */
 	sequence_number_t notify_generation;
-	/** The logical zone to notify next */
+	/* The logical zone to notify next */
 	struct logical_zone *logical_zone_to_notify;
-	/** The ID of the thread on which flush requests should be made */
+	/* The ID of the thread on which flush requests should be made */
 	thread_id_t thread_id;
-	/** The pool of flush requests */
+	/* The pool of flush requests */
 	mempool_t *flush_pool;
-	/** Bios waiting for a flush request to become available */
+	/* Bios waiting for a flush request to become available */
 	struct bio_list waiting_flush_bios;
-	/** The lock to protect the previous fields */
+	/* The lock to protect the previous fields */
 	spinlock_t lock;
-	/** The rotor for selecting the bio queue for submitting flush bios */
+	/* The rotor for selecting the bio queue for submitting flush bios */
 	zone_count_t bio_queue_rotor;
-	/** The number of flushes submitted to the current bio queue */
+	/* The number of flushes submitted to the current bio queue */
 	int flush_count;
 };
 
diff --git a/drivers/md/dm-vdo/recovery-journal.h b/drivers/md/dm-vdo/recovery-journal.h
index d78c6c7da4ea..899071173015 100644
--- a/drivers/md/dm-vdo/recovery-journal.h
+++ b/drivers/md/dm-vdo/recovery-journal.h
@@ -89,27 +89,27 @@ enum vdo_zone_type {
 };
 
 struct lock_counter {
-	/** The completion for notifying the owner of a lock release */
+	/* The completion for notifying the owner of a lock release */
 	struct vdo_completion completion;
-	/** The number of logical zones which may hold locks */
+	/* The number of logical zones which may hold locks */
 	zone_count_t logical_zones;
-	/** The number of physical zones which may hold locks */
+	/* The number of physical zones which may hold locks */
 	zone_count_t physical_zones;
-	/** The number of locks */
+	/* The number of locks */
 	block_count_t locks;
-	/** Whether the lock release notification is in flight */
+	/* Whether the lock release notification is in flight */
 	atomic_t state;
-	/** The number of logical zones which hold each lock */
+	/* The number of logical zones which hold each lock */
 	atomic_t *logical_zone_counts;
-	/** The number of physical zones which hold each lock */
+	/* The number of physical zones which hold each lock */
 	atomic_t *physical_zone_counts;
-	/** The per-lock counts for the journal zone */
+	/* The per-lock counts for the journal zone */
 	u16 *journal_counters;
-	/** The per-lock decrement counts for the journal zone */
+	/* The per-lock decrement counts for the journal zone */
 	atomic_t *journal_decrement_counts;
-	/** The per-zone, per-lock reference counts for logical zones */
+	/* The per-zone, per-lock reference counts for logical zones */
 	u16 *logical_counters;
-	/** The per-zone, per-lock reference counts for physical zones */
+	/* The per-zone, per-lock reference counts for physical zones */
 	u16 *physical_counters;
 };
 
diff --git a/drivers/md/dm-vdo/statistics.h b/drivers/md/dm-vdo/statistics.h
index da8b6a7fe24f..c88a75dffba3 100644
--- a/drivers/md/dm-vdo/statistics.h
+++ b/drivers/md/dm-vdo/statistics.h
@@ -13,11 +13,11 @@ enum {
 };
 
 struct block_allocator_statistics {
-	/** The total number of slabs from which blocks may be allocated */
+	/* The total number of slabs from which blocks may be allocated */
 	u64 slab_count;
-	/** The total number of slabs from which blocks have ever been allocated */
+	/* The total number of slabs from which blocks have ever been allocated */
 	u64 slabs_opened;
-	/** The number of times since loading that a slab has been re-opened */
+	/* The number of times since loading that a slab has been re-opened */
 	u64 slabs_reopened;
 };
 
@@ -29,235 +29,235 @@ struct block_allocator_statistics {
  * reporting purposes
  */
 struct commit_statistics {
-	/** The total number of items on which processing has started */
+	/* The total number of items on which processing has started */
 	u64 started;
-	/** The total number of items for which a write operation has been issued */
+	/* The total number of items for which a write operation has been issued */
 	u64 written;
-	/** The total number of items for which a write operation has completed */
+	/* The total number of items for which a write operation has completed */
 	u64 committed;
 };
 
 /** Counters for events in the recovery journal */
 struct recovery_journal_statistics {
-	/** Number of times the on-disk journal was full */
+	/* Number of times the on-disk journal was full */
 	u64 disk_full;
-	/** Number of times the recovery journal requested slab journal commits. */
+	/* Number of times the recovery journal requested slab journal commits. */
 	u64 slab_journal_commits_requested;
-	/** Write/Commit totals for individual journal entries */
+	/* Write/Commit totals for individual journal entries */
 	struct commit_statistics entries;
-	/** Write/Commit totals for journal blocks */
+	/* Write/Commit totals for journal blocks */
 	struct commit_statistics blocks;
 };
 
 /** The statistics for the compressed block packer. */
 struct packer_statistics {
-	/** Number of compressed data items written since startup */
+	/* Number of compressed data items written since startup */
 	u64 compressed_fragments_written;
-	/** Number of blocks containing compressed items written since startup */
+	/* Number of blocks containing compressed items written since startup */
 	u64 compressed_blocks_written;
-	/** Number of VIOs that are pending in the packer */
+	/* Number of VIOs that are pending in the packer */
 	u64 compressed_fragments_in_packer;
 };
 
 /** The statistics for the slab journals. */
 struct slab_journal_statistics {
-	/** Number of times the on-disk journal was full */
+	/* Number of times the on-disk journal was full */
 	u64 disk_full_count;
-	/** Number of times an entry was added over the flush threshold */
+	/* Number of times an entry was added over the flush threshold */
 	u64 flush_count;
-	/** Number of times an entry was added over the block threshold */
+	/* Number of times an entry was added over the block threshold */
 	u64 blocked_count;
-	/** Number of times a tail block was written */
+	/* Number of times a tail block was written */
 	u64 blocks_written;
-	/** Number of times we had to wait for the tail to write */
+	/* Number of times we had to wait for the tail to write */
 	u64 tail_busy_count;
 };
 
 /** The statistics for the slab summary. */
 struct slab_summary_statistics {
-	/** Number of blocks written */
+	/* Number of blocks written */
 	u64 blocks_written;
 };
 
 /** The statistics for the reference counts. */
 struct ref_counts_statistics {
-	/** Number of reference blocks written */
+	/* Number of reference blocks written */
 	u64 blocks_written;
 };
 
 /** The statistics for the block map. */
 struct block_map_statistics {
-	/** number of dirty (resident) pages */
+	/* number of dirty (resident) pages */
 	u32 dirty_pages;
-	/** number of clean (resident) pages */
+	/* number of clean (resident) pages */
 	u32 clean_pages;
-	/** number of free pages */
+	/* number of free pages */
 	u32 free_pages;
-	/** number of pages in failed state */
+	/* number of pages in failed state */
 	u32 failed_pages;
-	/** number of pages incoming */
+	/* number of pages incoming */
 	u32 incoming_pages;
-	/** number of pages outgoing */
+	/* number of pages outgoing */
 	u32 outgoing_pages;
-	/** how many times free page not avail */
+	/* how many times free page not avail */
 	u32 cache_pressure;
-	/** number of get_vdo_page() calls for read */
+	/* number of get_vdo_page() calls for read */
 	u64 read_count;
-	/** number of get_vdo_page() calls for write */
+	/* number of get_vdo_page() calls for write */
 	u64 write_count;
-	/** number of times pages failed to read */
+	/* number of times pages failed to read */
 	u64 failed_reads;
-	/** number of times pages failed to write */
+	/* number of times pages failed to write */
 	u64 failed_writes;
-	/** number of gets that are reclaimed */
+	/* number of gets that are reclaimed */
 	u64 reclaimed;
-	/** number of gets for outgoing pages */
+	/* number of gets for outgoing pages */
 	u64 read_outgoing;
-	/** number of gets that were already there */
+	/* number of gets that were already there */
 	u64 found_in_cache;
-	/** number of gets requiring discard */
+	/* number of gets requiring discard */
 	u64 discard_required;
-	/** number of gets enqueued for their page */
+	/* number of gets enqueued for their page */
 	u64 wait_for_page;
-	/** number of gets that have to fetch */
+	/* number of gets that have to fetch */
 	u64 fetch_required;
-	/** number of page fetches */
+	/* number of page fetches */
 	u64 pages_loaded;
-	/** number of page saves */
+	/* number of page saves */
 	u64 pages_saved;
-	/** the number of flushes issued */
+	/* the number of flushes issued */
 	u64 flush_count;
 };
 
 /** The dedupe statistics from hash locks */
 struct hash_lock_statistics {
-	/** Number of times the UDS advice proved correct */
+	/* Number of times the UDS advice proved correct */
 	u64 dedupe_advice_valid;
-	/** Number of times the UDS advice proved incorrect */
+	/* Number of times the UDS advice proved incorrect */
 	u64 dedupe_advice_stale;
-	/** Number of writes with the same data as another in-flight write */
+	/* Number of writes with the same data as another in-flight write */
 	u64 concurrent_data_matches;
-	/** Number of writes whose hash collided with an in-flight write */
+	/* Number of writes whose hash collided with an in-flight write */
 	u64 concurrent_hash_collisions;
-	/** Current number of dedupe queries that are in flight */
+	/* Current number of dedupe queries that are in flight */
 	u32 curr_dedupe_queries;
 };
 
 /** Counts of error conditions in VDO. */
 struct error_statistics {
-	/** number of times VDO got an invalid dedupe advice PBN from UDS */
+	/* number of times VDO got an invalid dedupe advice PBN from UDS */
 	u64 invalid_advice_pbn_count;
-	/** number of times a VIO completed with a VDO_NO_SPACE error */
+	/* number of times a VIO completed with a VDO_NO_SPACE error */
 	u64 no_space_error_count;
-	/** number of times a VIO completed with a VDO_READ_ONLY error */
+	/* number of times a VIO completed with a VDO_READ_ONLY error */
 	u64 read_only_error_count;
 };
 
 struct bio_stats {
-	/** Number of REQ_OP_READ bios */
+	/* Number of REQ_OP_READ bios */
 	u64 read;
-	/** Number of REQ_OP_WRITE bios with data */
+	/* Number of REQ_OP_WRITE bios with data */
 	u64 write;
-	/** Number of bios tagged with REQ_PREFLUSH and containing no data */
+	/* Number of bios tagged with REQ_PREFLUSH and containing no data */
 	u64 empty_flush;
-	/** Number of REQ_OP_DISCARD bios */
+	/* Number of REQ_OP_DISCARD bios */
 	u64 discard;
-	/** Number of bios tagged with REQ_PREFLUSH */
+	/* Number of bios tagged with REQ_PREFLUSH */
 	u64 flush;
-	/** Number of bios tagged with REQ_FUA */
+	/* Number of bios tagged with REQ_FUA */
 	u64 fua;
 };
 
 struct memory_usage {
-	/** Tracked bytes currently allocated. */
+	/* Tracked bytes currently allocated. */
 	u64 bytes_used;
-	/** Maximum tracked bytes allocated. */
+	/* Maximum tracked bytes allocated. */
 	u64 peak_bytes_used;
 };
 
 /** UDS index statistics */
 struct index_statistics {
-	/** Number of records stored in the index */
+	/* Number of records stored in the index */
 	u64 entries_indexed;
-	/** Number of post calls that found an existing entry */
+	/* Number of post calls that found an existing entry */
 	u64 posts_found;
-	/** Number of post calls that added a new entry */
+	/* Number of post calls that added a new entry */
 	u64 posts_not_found;
-	/** Number of query calls that found an existing entry */
+	/* Number of query calls that found an existing entry */
 	u64 queries_found;
-	/** Number of query calls that added a new entry */
+	/* Number of query calls that added a new entry */
 	u64 queries_not_found;
-	/** Number of update calls that found an existing entry */
+	/* Number of update calls that found an existing entry */
 	u64 updates_found;
-	/** Number of update calls that added a new entry */
+	/* Number of update calls that added a new entry */
 	u64 updates_not_found;
-	/** Number of entries discarded */
+	/* Number of entries discarded */
 	u64 entries_discarded;
 };
 
 /** The statistics of the vdo service. */
 struct vdo_statistics {
 	u32 version;
-	/** Number of blocks used for data */
+	/* Number of blocks used for data */
 	u64 data_blocks_used;
-	/** Number of blocks used for VDO metadata */
+	/* Number of blocks used for VDO metadata */
 	u64 overhead_blocks_used;
-	/** Number of logical blocks that are currently mapped to physical blocks */
+	/* Number of logical blocks that are currently mapped to physical blocks */
 	u64 logical_blocks_used;
-	/** number of physical blocks */
+	/* number of physical blocks */
 	block_count_t physical_blocks;
-	/** number of logical blocks */
+	/* number of logical blocks */
 	block_count_t logical_blocks;
-	/** Size of the block map page cache, in bytes */
+	/* Size of the block map page cache, in bytes */
 	u64 block_map_cache_size;
-	/** The physical block size */
+	/* The physical block size */
 	u64 block_size;
-	/** Number of times the VDO has successfully recovered */
+	/* Number of times the VDO has successfully recovered */
 	u64 complete_recoveries;
-	/** Number of times the VDO has recovered from read-only mode */
+	/* Number of times the VDO has recovered from read-only mode */
 	u64 read_only_recoveries;
-	/** String describing the operating mode of the VDO */
+	/* String describing the operating mode of the VDO */
 	char mode[15];
-	/** Whether the VDO is in recovery mode */
+	/* Whether the VDO is in recovery mode */
 	bool in_recovery_mode;
-	/** What percentage of recovery mode work has been completed */
+	/* What percentage of recovery mode work has been completed */
 	u8 recovery_percentage;
-	/** The statistics for the compressed block packer */
+	/* The statistics for the compressed block packer */
 	struct packer_statistics packer;
-	/** Counters for events in the block allocator */
+	/* Counters for events in the block allocator */
 	struct block_allocator_statistics allocator;
-	/** Counters for events in the recovery journal */
+	/* Counters for events in the recovery journal */
 	struct recovery_journal_statistics journal;
-	/** The statistics for the slab journals */
+	/* The statistics for the slab journals */
 	struct slab_journal_statistics slab_journal;
-	/** The statistics for the slab summary */
+	/* The statistics for the slab summary */
 	struct slab_summary_statistics slab_summary;
-	/** The statistics for the reference counts */
+	/* The statistics for the reference counts */
 	struct ref_counts_statistics ref_counts;
-	/** The statistics for the block map */
+	/* The statistics for the block map */
 	struct block_map_statistics block_map;
-	/** The dedupe statistics from hash locks */
+	/* The dedupe statistics from hash locks */
 	struct hash_lock_statistics hash_lock;
-	/** Counts of error conditions */
+	/* Counts of error conditions */
 	struct error_statistics errors;
-	/** The VDO instance */
+	/* The VDO instance */
 	u32 instance;
-	/** Current number of active VIOs */
+	/* Current number of active VIOs */
 	u32 current_vios_in_progress;
-	/** Maximum number of active VIOs */
+	/* Maximum number of active VIOs */
 	u32 max_vios;
-	/** Number of times the UDS index was too slow in responding */
+	/* Number of times the UDS index was too slow in responding */
 	u64 dedupe_advice_timeouts;
-	/** Number of flush requests submitted to the storage device */
+	/* Number of flush requests submitted to the storage device */
 	u64 flush_out;
-	/** Logical block size */
+	/* Logical block size */
 	u64 logical_block_size;
-	/** Bios submitted into VDO from above */
+	/* Bios submitted into VDO from above */
 	struct bio_stats bios_in;
 	struct bio_stats bios_in_partial;
-	/** Bios submitted onward for user data */
+	/* Bios submitted onward for user data */
 	struct bio_stats bios_out;
-	/** Bios submitted onward for metadata */
+	/* Bios submitted onward for metadata */
 	struct bio_stats bios_meta;
 	struct bio_stats bios_journal;
 	struct bio_stats bios_page_cache;
@@ -267,11 +267,11 @@ struct vdo_statistics {
 	struct bio_stats bios_page_cache_completed;
 	struct bio_stats bios_acknowledged;
 	struct bio_stats bios_acknowledged_partial;
-	/** Current number of bios in progress */
+	/* Current number of bios in progress */
 	struct bio_stats bios_in_progress;
-	/** Memory usage stats. */
+	/* Memory usage stats. */
 	struct memory_usage memory_usage;
-	/** The statistics for the UDS index */
+	/* The statistics for the UDS index */
 	struct index_statistics index;
 };
 
diff --git a/drivers/md/dm-vdo/vdo.h b/drivers/md/dm-vdo/vdo.h
index 35d603066529..772317e6db52 100644
--- a/drivers/md/dm-vdo/vdo.h
+++ b/drivers/md/dm-vdo/vdo.h
@@ -25,13 +25,13 @@
 #include "uds.h"
 
 enum notifier_state {
-	/** Notifications are allowed but not in progress */
+	/* Notifications are allowed but not in progress */
 	MAY_NOTIFY,
-	/** A notification is in progress */
+	/* A notification is in progress */
 	NOTIFYING,
-	/** Notifications are not allowed */
+	/* Notifications are not allowed */
 	MAY_NOT_NOTIFY,
-	/** A notification has completed */
+	/* A notification has completed */
 	NOTIFIED,
 };
 
diff --git a/drivers/md/dm-vdo/vio.c b/drivers/md/dm-vdo/vio.c
index f9c54ec56176..eb6838ddabbb 100644
--- a/drivers/md/dm-vdo/vio.c
+++ b/drivers/md/dm-vdo/vio.c
@@ -20,21 +20,21 @@
 
 /* A vio_pool is a collection of preallocated vios. */
 struct vio_pool {
-	/** The number of objects managed by the pool */
+	/* The number of objects managed by the pool */
 	size_t size;
-	/** The list of objects which are available */
+	/* The list of objects which are available */
 	struct list_head available;
-	/** The queue of requestors waiting for objects from the pool */
+	/* The queue of requestors waiting for objects from the pool */
 	struct vdo_wait_queue waiting;
-	/** The number of objects currently in use */
+	/* The number of objects currently in use */
 	size_t busy_count;
-	/** The list of objects which are in use */
+	/* The list of objects which are in use */
 	struct list_head busy;
-	/** The ID of the thread on which this pool may be used */
+	/* The ID of the thread on which this pool may be used */
 	thread_id_t thread_id;
-	/** The buffer backing the pool's vios */
+	/* The buffer backing the pool's vios */
 	char *buffer;
-	/** The pool entries */
+	/* The pool entries */
 	struct pooled_vio vios[];
 };
 
-- 
2.42.0

[PATCH 4/5] dm vdo chapter_index: fix a few small nits

[Matthew Sakai]

From: Mike Snitzer <snitzer@kernel.org>

Add missing braces and raise one function arg up a line to eliminate
line wrap.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Susan LeGendre-McGhee <slegendr@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
---
 drivers/md/dm-vdo/chapter-index.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/md/dm-vdo/chapter-index.c b/drivers/md/dm-vdo/chapter-index.c
index 7285a842e888..363991d56218 100644
--- a/drivers/md/dm-vdo/chapter-index.c
+++ b/drivers/md/dm-vdo/chapter-index.c
@@ -19,8 +19,7 @@ int uds_make_open_chapter_index(struct open_chapter_index **chapter_index,
 	size_t memory_size;
 	struct open_chapter_index *index;
 
-	result = uds_allocate(1, struct open_chapter_index, "open chapter index",
-			      &index);
+	result = uds_allocate(1, struct open_chapter_index, "open chapter index", &index);
 	if (result != UDS_SUCCESS)
 		return result;
 
@@ -197,9 +196,10 @@ int uds_pack_open_chapter_index_page(struct open_chapter_index *chapter_index,
 		} while (!entry.at_end);
 	}
 
-	if (removals > 0)
+	if (removals > 0) {
 		uds_log_warning("To avoid chapter index page overflow in chapter %llu, %u entries were removed from the chapter index",
 				(unsigned long long) chapter_number, removals);
+	}
 
 	return UDS_SUCCESS;
 }
@@ -249,13 +249,14 @@ int uds_validate_chapter_index_page(const struct delta_index_page *index_page,
 
 			/* Also make sure that the record page field contains a plausible value. */
 			if (uds_get_delta_entry_value(&entry) >=
-			    geometry->record_pages_per_chapter)
+			    geometry->record_pages_per_chapter) {
 				/*
 				 * Do not log this as an error. It happens in normal operation when
 				 * we are doing a rebuild but haven't written the entire volume
 				 * once.
 				 */
 				return UDS_CORRUPT_DATA;
+			}
 		}
 	}
 	return UDS_SUCCESS;
-- 
2.42.0

[PATCH 5/5] dm vdo delta-index: fix various small nits

[Matthew Sakai]

From: Mike Snitzer <snitzer@kernel.org>

Fix some needless line wrapping (given surrounding context), missing
braces and some stale or incorrect references to data structure or
function name.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Susan LeGendre-McGhee <slegendr@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
---
 drivers/md/dm-vdo/delta-index.c | 23 ++++++++++-------------
 drivers/md/dm-vdo/delta-index.h |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/md/dm-vdo/delta-index.c b/drivers/md/dm-vdo/delta-index.c
index 0322552cdbd8..6306777bb202 100644
--- a/drivers/md/dm-vdo/delta-index.c
+++ b/drivers/md/dm-vdo/delta-index.c
@@ -47,7 +47,7 @@
  *
  * The delta in each entry is encoded with a variable-length Huffman code to minimize the memory
  * used by small deltas. The Huffman code is specified by three parameters, which can be computed
- * from the desired mean delta when the index is full. (See compute_coding constants() for
+ * from the desired mean delta when the index is full. (See compute_coding_constants() for
  * details.)
  *
  * The bit field utilities used to read and write delta entries assume that it is possible to read
@@ -294,8 +294,7 @@ void uds_reset_delta_index(const struct delta_index *delta_index)
  * - The next INCR values code using MINBITS+2 bits.
  * - (and so on).
  */
-static void compute_coding_constants(u32 mean_delta, u16 *min_bits, u32 *min_keys,
-				     u32 *incr_keys)
+static void compute_coding_constants(u32 mean_delta, u16 *min_bits, u32 *min_keys, u32 *incr_keys)
 {
 	/*
 	 * We want to compute the rounded value of log(2) * mean_delta. Since we cannot always use
@@ -617,8 +616,7 @@ static inline void set_zero(u8 *memory, u64 offset, u32 size)
  * Move several bits from a higher to a lower address, moving the lower addressed bits first. The
  * size and memory offsets are measured in bits.
  */
-static void move_bits_down(const u8 *from, u64 from_offset, u8 *to, u64 to_offset,
-			   u32 size)
+static void move_bits_down(const u8 *from, u64 from_offset, u8 *to, u64 to_offset, u32 size)
 {
 	const u8 *source;
 	u8 *destination;
@@ -658,8 +656,7 @@ static void move_bits_down(const u8 *from, u64 from_offset, u8 *to, u64 to_offse
  * Move several bits from a lower to a higher address, moving the higher addressed bits first. The
  * size and memory offsets are measured in bits.
  */
-static void move_bits_up(const u8 *from, u64 from_offset, u8 *to, u64 to_offset,
-			 u32 size)
+static void move_bits_up(const u8 *from, u64 from_offset, u8 *to, u64 to_offset, u32 size)
 {
 	const u8 *source;
 	u8 *destination;
@@ -1006,8 +1003,7 @@ static int restore_delta_list_to_zone(struct delta_zone *delta_zone,
 	return UDS_SUCCESS;
 }
 
-static int restore_delta_list_data(struct delta_index *delta_index,
-				   unsigned int load_zone,
+static int restore_delta_list_data(struct delta_index *delta_index, unsigned int load_zone,
 				   struct buffered_reader *buffered_reader, u8 *data)
 {
 	int result;
@@ -1016,9 +1012,10 @@ static int restore_delta_list_data(struct delta_index *delta_index,
 	unsigned int new_zone;
 
 	result = uds_read_from_buffered_reader(buffered_reader, buffer, sizeof(buffer));
-	if (result != UDS_SUCCESS)
+	if (result != UDS_SUCCESS) {
 		return uds_log_warning_strerror(result,
 						"failed to read delta list data");
+	}
 
 	save_info = (struct delta_list_save_info) {
 		.tag = buffer[0],
@@ -1028,9 +1025,10 @@ static int restore_delta_list_data(struct delta_index *delta_index,
 	};
 
 	if ((save_info.bit_offset >= BITS_PER_BYTE) ||
-	    (save_info.byte_count > DELTA_LIST_MAX_BYTE_COUNT))
+	    (save_info.byte_count > DELTA_LIST_MAX_BYTE_COUNT)) {
 		return uds_log_warning_strerror(UDS_CORRUPT_DATA,
 						"corrupt delta list data");
+	}
 
 	/* Make sure the data is intended for this delta index. */
 	if (save_info.tag != delta_index->tag)
@@ -1422,8 +1420,7 @@ static void set_delta(struct delta_index_entry *delta_entry, u32 delta)
 {
 	const struct delta_zone *delta_zone = delta_entry->delta_zone;
 	u32 key_bits = (delta_zone->min_bits +
-			((delta_zone->incr_keys -
-			  delta_zone->min_keys + delta) /
+			((delta_zone->incr_keys - delta_zone->min_keys + delta) /
 			 delta_zone->incr_keys));
 
 	delta_entry->delta = delta;
diff --git a/drivers/md/dm-vdo/delta-index.h b/drivers/md/dm-vdo/delta-index.h
index 046290b7ebe7..b3b38fb440bf 100644
--- a/drivers/md/dm-vdo/delta-index.h
+++ b/drivers/md/dm-vdo/delta-index.h
@@ -113,7 +113,7 @@ struct delta_index {
  */
 struct delta_index_page {
 	struct delta_index delta_index;
-	/* These values are loaded from the DeltaPageHeader */
+	/* These values are loaded from the delta_page_header */
 	u32 lowest_list_number;
 	u32 highest_list_number;
 	u64 virtual_chapter_number;
-- 
2.42.0