Skip to content

Commit 19ac19e

Browse files
lorelei-sakaiMikulas Patocka
authored andcommitted
dm vdo: fix function doc comment formatting
Signed-off-by: Matthew Sakai <[email protected]> Signed-off-by: Mikulas Patocka <[email protected]>
1 parent 7e976b2 commit 19ac19e

File tree

10 files changed

+19
-23
lines changed

10 files changed

+19
-23
lines changed

drivers/md/dm-vdo/block-map.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ static int initialize_info(struct vdo_page_cache *cache)
209209
/**
210210
* allocate_cache_components() - Allocate components of the cache which require their own
211211
* allocation.
212-
* @maximum_age: The number of journal blocks before a dirtied page is considered old and must be
213-
* written out.
214212
*
215213
* The caller is responsible for all clean up on errors.
216214
*

drivers/md/dm-vdo/data-vio.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,9 @@ static u32 __must_check pack_status(struct data_vio_compression_status status)
327327

328328
/**
329329
* set_data_vio_compression_status() - Set the compression status of a data_vio.
330-
* @state: The expected current status of the data_vio.
331-
* @new_state: The status to set.
330+
* @data_vio: The data_vio to change.
331+
* @status: The expected current status of the data_vio.
332+
* @new_status: The status to set.
332333
*
333334
* Return: true if the new status was set, false if the data_vio's compression status did not
334335
* match the expected state, and so was left unchanged.
@@ -836,7 +837,7 @@ static void destroy_data_vio(struct data_vio *data_vio)
836837
* @vdo: The vdo to which the pool will belong.
837838
* @pool_size: The number of data_vios in the pool.
838839
* @discard_limit: The maximum number of data_vios which may be used for discards.
839-
* @pool: A pointer to hold the newly allocated pool.
840+
* @pool_ptr: A pointer to hold the newly allocated pool.
840841
*/
841842
int make_data_vio_pool(struct vdo *vdo, data_vio_count_t pool_size,
842843
data_vio_count_t discard_limit, struct data_vio_pool **pool_ptr)

drivers/md/dm-vdo/dedupe.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ static void wait_on_hash_lock(struct hash_lock *lock, struct data_vio *data_vio)
565565
* @waiter: The data_vio's waiter link.
566566
* @context: Not used.
567567
*/
568-
static void abort_waiter(struct vdo_waiter *waiter, void *context __always_unused)
568+
static void abort_waiter(struct vdo_waiter *waiter, void __always_unused *context)
569569
{
570570
write_data_vio(vdo_waiter_as_data_vio(waiter));
571571
}
@@ -1727,7 +1727,7 @@ static void report_bogus_lock_state(struct hash_lock *lock, struct data_vio *dat
17271727
/**
17281728
* vdo_continue_hash_lock() - Continue the processing state after writing, compressing, or
17291729
* deduplicating.
1730-
* @data_vio: The data_vio to continue processing in its hash lock.
1730+
* @completion: The data_vio completion to continue processing in its hash lock.
17311731
*
17321732
* Asynchronously continue processing a data_vio in its hash lock after it has finished writing,
17331733
* compressing, or deduplicating, so it can share the result with any data_vios waiting in the hash
@@ -1825,7 +1825,7 @@ static inline int assert_hash_lock_preconditions(const struct data_vio *data_vio
18251825

18261826
/**
18271827
* vdo_acquire_hash_lock() - Acquire or share a lock on a record name.
1828-
* @data_vio: The data_vio acquiring a lock on its record name.
1828+
* @completion: The data_vio completion acquiring a lock on its record name.
18291829
*
18301830
* Acquire or share a lock on the hash (record name) of the data in a data_vio, updating the
18311831
* data_vio to reference the lock. This must only be called in the correct thread for the zone. In
@@ -2679,7 +2679,8 @@ static void get_index_statistics(struct hash_zones *zones,
26792679

26802680
/**
26812681
* vdo_get_dedupe_statistics() - Tally the statistics from all the hash zones and the UDS index.
2682-
* @hash_zones: The hash zones to query
2682+
* @zones: The hash zones to query
2683+
* @stats: A structure to store the statistics
26832684
*
26842685
* Return: The sum of the hash lock statistics from all hash zones plus the statistics from the UDS
26852686
* index

drivers/md/dm-vdo/encodings.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ static int __must_check make_partition(struct layout *layout, enum partition_id
858858
/**
859859
* vdo_initialize_layout() - Lay out the partitions of a vdo.
860860
* @size: The entire size of the vdo.
861-
* @origin: The start of the layout on the underlying storage in blocks.
861+
* @offset: The start of the layout on the underlying storage in blocks.
862862
* @block_map_blocks: The size of the block map partition.
863863
* @journal_blocks: The size of the journal partition.
864864
* @summary_blocks: The size of the slab summary partition.

drivers/md/dm-vdo/io-submitter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ void __submit_metadata_vio(struct vio *vio, physical_block_number_t physical,
367367
* completions.
368368
* @max_requests_active: Number of bios for merge tracking.
369369
* @vdo: The vdo which will use this submitter.
370-
* @io_submitter: pointer to the new data structure.
370+
* @io_submitter_ptr: pointer to the new data structure.
371371
*
372372
* Return: VDO_SUCCESS or an error.
373373
*/

drivers/md/dm-vdo/packer.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ static void abort_packing(struct data_vio *data_vio)
250250
/**
251251
* release_compressed_write_waiter() - Update a data_vio for which a successful compressed write
252252
* has completed and send it on its way.
253-
254253
* @data_vio: The data_vio to release.
255254
* @allocation: The allocation to which the compressed block was written.
256255
*/
@@ -383,7 +382,7 @@ static void initialize_compressed_block(struct compressed_block *block, u16 size
383382
* @compression: The agent's compression_state to pack in to.
384383
* @data_vio: The data_vio to pack.
385384
* @offset: The offset into the compressed block at which to pack the fragment.
386-
* @compressed_block: The compressed block which will be written out when batch is fully packed.
385+
* @block: The compressed block which will be written out when batch is fully packed.
387386
*
388387
* Return: The new amount of space used.
389388
*/

drivers/md/dm-vdo/physical-zone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ static int allocate_and_lock_block(struct allocation *allocation)
517517
* @waiter: The allocating_vio that was waiting to allocate.
518518
* @context: The context (unused).
519519
*/
520-
static void retry_allocation(struct vdo_waiter *waiter, void *context __always_unused)
520+
static void retry_allocation(struct vdo_waiter *waiter, void __always_unused *context)
521521
{
522522
struct data_vio *data_vio = vdo_waiter_as_data_vio(waiter);
523523

drivers/md/dm-vdo/recovery-journal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ static void add_queued_recovery_entries(struct recovery_journal_block *block)
13651365
*
13661366
* Implements waiter_callback_fn.
13671367
*/
1368-
static void write_block(struct vdo_waiter *waiter, void *context __always_unused)
1368+
static void write_block(struct vdo_waiter *waiter, void __always_unused *context)
13691369
{
13701370
struct recovery_journal_block *block =
13711371
container_of(waiter, struct recovery_journal_block, write_waiter);

drivers/md/dm-vdo/slab-depot.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,7 @@ static struct reference_block * __must_check get_reference_block(struct vdo_slab
12871287
* slab_block_number_from_pbn() - Determine the index within the slab of a particular physical
12881288
* block number.
12891289
* @slab: The slab.
1290-
* @physical_block_number: The physical block number.
1290+
* @pbn: The physical block number.
12911291
* @slab_block_number_ptr: A pointer to the slab block number.
12921292
*
12931293
* Return: VDO_SUCCESS or an error code.
@@ -1459,7 +1459,6 @@ static int increment_for_data(struct vdo_slab *slab, struct reference_block *blo
14591459
* @block_number: The block to update.
14601460
* @old_status: The reference status of the data block before this decrement.
14611461
* @updater: The reference updater doing this operation in case we need to look up the pbn lock.
1462-
* @lock: The pbn_lock associated with the block being decremented (may be NULL).
14631462
* @counter_ptr: A pointer to the count for the data block (in, out).
14641463
* @adjust_block_count: Whether to update the allocator's free block count.
14651464
*
@@ -3232,8 +3231,7 @@ int vdo_enqueue_clean_slab_waiter(struct block_allocator *allocator,
32323231
/**
32333232
* vdo_modify_reference_count() - Modify the reference count of a block by first making a slab
32343233
* journal entry and then updating the reference counter.
3235-
*
3236-
* @data_vio: The data_vio for which to add the entry.
3234+
* @completion: The data_vio completion for which to add the entry.
32373235
* @updater: Which of the data_vio's reference updaters is being submitted.
32383236
*/
32393237
void vdo_modify_reference_count(struct vdo_completion *completion,
@@ -4750,8 +4748,7 @@ void vdo_use_new_slabs(struct slab_depot *depot, struct vdo_completion *parent)
47504748
/**
47514749
* stop_scrubbing() - Tell the scrubber to stop scrubbing after it finishes the slab it is
47524750
* currently working on.
4753-
* @scrubber: The scrubber to stop.
4754-
* @parent: The completion to notify when scrubbing has stopped.
4751+
* @allocator: The block allocator owning the scrubber to stop.
47554752
*/
47564753
static void stop_scrubbing(struct block_allocator *allocator)
47574754
{

drivers/md/dm-vdo/vdo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ static void finish_vdo(struct vdo *vdo)
643643

644644
/**
645645
* free_listeners() - Free the list of read-only listeners associated with a thread.
646-
* @thread_data: The thread holding the list to free.
646+
* @thread: The thread holding the list to free.
647647
*/
648648
static void free_listeners(struct vdo_thread *thread)
649649
{
@@ -852,7 +852,7 @@ int vdo_synchronous_flush(struct vdo *vdo)
852852
/**
853853
* vdo_get_state() - Get the current state of the vdo.
854854
* @vdo: The vdo.
855-
855+
*
856856
* Context: This method may be called from any thread.
857857
*
858858
* Return: The current state of the vdo.

0 commit comments

Comments
 (0)