Skip to content

Commit

Permalink
Merge pull request #73 from lorelei-sakai/fix/kernel-warning-cleanup
Browse files Browse the repository at this point in the history
[VDO-5828] Clean up kernel attribute and doc warnings
  • Loading branch information
lorelei-sakai authored Nov 4, 2024
2 parents 46558c0 + 2b42665 commit 63a477e
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 40 deletions.
2 changes: 0 additions & 2 deletions drivers/md/dm-vdo/block-map.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ static int initialize_info(struct vdo_page_cache *cache)
/**
* allocate_cache_components() - Allocate components of the cache which require their own
* allocation.
* @maximum_age: The number of journal blocks before a dirtied page is considered old and must be
* written out.
*
* The caller is responsible for all clean up on errors.
*
Expand Down
7 changes: 4 additions & 3 deletions drivers/md/dm-vdo/data-vio.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,9 @@ static u32 __must_check pack_status(struct data_vio_compression_status status)

/**
* set_data_vio_compression_status() - Set the compression status of a data_vio.
* @state: The expected current status of the data_vio.
* @new_state: The status to set.
* @data_vio: The data_vio to change.
* @status: The expected current status of the data_vio.
* @new_status: The status to set.
*
* Return: true if the new status was set, false if the data_vio's compression status did not
* match the expected state, and so was left unchanged.
Expand Down Expand Up @@ -836,7 +837,7 @@ static void destroy_data_vio(struct data_vio *data_vio)
* @vdo: The vdo to which the pool will belong.
* @pool_size: The number of data_vios in the pool.
* @discard_limit: The maximum number of data_vios which may be used for discards.
* @pool: A pointer to hold the newly allocated pool.
* @pool_ptr: A pointer to hold the newly allocated pool.
*/
int make_data_vio_pool(struct vdo *vdo, data_vio_count_t pool_size,
data_vio_count_t discard_limit, struct data_vio_pool **pool_ptr)
Expand Down
9 changes: 5 additions & 4 deletions drivers/md/dm-vdo/dedupe.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ static void wait_on_hash_lock(struct hash_lock *lock, struct data_vio *data_vio)
* @waiter: The data_vio's waiter link.
* @context: Not used.
*/
static void abort_waiter(struct vdo_waiter *waiter, void *context __always_unused)
static void abort_waiter(struct vdo_waiter *waiter, void __always_unused *context)
{
write_data_vio(vdo_waiter_as_data_vio(waiter));
}
Expand Down Expand Up @@ -1727,7 +1727,7 @@ static void report_bogus_lock_state(struct hash_lock *lock, struct data_vio *dat
/**
* vdo_continue_hash_lock() - Continue the processing state after writing, compressing, or
* deduplicating.
* @data_vio: The data_vio to continue processing in its hash lock.
* @completion: The data_vio completion to continue processing in its hash lock.
*
* Asynchronously continue processing a data_vio in its hash lock after it has finished writing,
* compressing, or deduplicating, so it can share the result with any data_vios waiting in the hash
Expand Down Expand Up @@ -1825,7 +1825,7 @@ static inline int assert_hash_lock_preconditions(const struct data_vio *data_vio

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

/**
* vdo_get_dedupe_statistics() - Tally the statistics from all the hash zones and the UDS index.
* @hash_zones: The hash zones to query
* @zones: The hash zones to query
* @stats: A structure to store the statistics
*
* Return: The sum of the hash lock statistics from all hash zones plus the statistics from the UDS
* index
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm-vdo/encodings.c
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ static int __must_check make_partition(struct layout *layout, enum partition_id
/**
* vdo_initialize_layout() - Lay out the partitions of a vdo.
* @size: The entire size of the vdo.
* @origin: The start of the layout on the underlying storage in blocks.
* @offset: The start of the layout on the underlying storage in blocks.
* @block_map_blocks: The size of the block map partition.
* @journal_blocks: The size of the journal partition.
* @summary_blocks: The size of the slab summary partition.
Expand Down
28 changes: 11 additions & 17 deletions drivers/md/dm-vdo/int-map.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
* it's crucial to keep the hop fields near the buckets that they use them so they'll tend to share
* cache lines.
*/
struct __packed bucket {
struct bucket {
/**
* @first_hop: The biased offset of the first entry in the hop list of the neighborhood
* that hashes to this bucket.
Expand All @@ -82,7 +82,7 @@ struct __packed bucket {
u64 key;
/** @value: The value stored in this bucket (NULL if empty). */
void *value;
};
} __packed;

/**
* struct int_map - The concrete definition of the opaque int_map type.
Expand Down Expand Up @@ -310,7 +310,6 @@ static struct bucket *select_bucket(const struct int_map *map, u64 key)
/**
* search_hop_list() - Search the hop list associated with given hash bucket for a given search
* key.
* @map: The map being searched.
* @bucket: The map bucket to search for the key.
* @key: The mapping key.
* @previous_ptr: Output. if not NULL, a pointer in which to store the bucket in the list preceding
Expand All @@ -321,9 +320,7 @@ static struct bucket *select_bucket(const struct int_map *map, u64 key)
*
* Return: An entry that matches the key, or NULL if not found.
*/
static struct bucket *search_hop_list(struct int_map *map __always_unused,
struct bucket *bucket,
u64 key,
static struct bucket *search_hop_list(struct bucket *bucket, u64 key,
struct bucket **previous_ptr)
{
struct bucket *previous = NULL;
Expand Down Expand Up @@ -357,7 +354,7 @@ static struct bucket *search_hop_list(struct int_map *map __always_unused,
*/
void *vdo_int_map_get(struct int_map *map, u64 key)
{
struct bucket *match = search_hop_list(map, select_bucket(map, key), key, NULL);
struct bucket *match = search_hop_list(select_bucket(map, key), key, NULL);

return ((match != NULL) ? match->value : NULL);
}
Expand Down Expand Up @@ -443,7 +440,6 @@ find_empty_bucket(struct int_map *map, struct bucket *bucket, unsigned int max_p

/**
* move_empty_bucket() - Move an empty bucket closer to the start of the bucket array.
* @map: The map containing the bucket.
* @hole: The empty bucket to fill with an entry that precedes it in one of its enclosing
* neighborhoods.
*
Expand All @@ -454,8 +450,7 @@ find_empty_bucket(struct int_map *map, struct bucket *bucket, unsigned int max_p
* Return: The bucket that was vacated by moving its entry to the provided hole, or NULL if no
* entry could be moved.
*/
static struct bucket *move_empty_bucket(struct int_map *map __always_unused,
struct bucket *hole)
static struct bucket *move_empty_bucket(struct bucket *hole)
{
/*
* Examine every neighborhood that the empty bucket is part of, starting with the one in
Expand Down Expand Up @@ -516,7 +511,6 @@ static struct bucket *move_empty_bucket(struct int_map *map __always_unused,
/**
* update_mapping() - Find and update any existing mapping for a given key, returning the value
* associated with the key in the provided pointer.
* @map: The int_map to attempt to modify.
* @neighborhood: The first bucket in the neighborhood that would contain the search key
* @key: The key with which to associate the new value.
* @new_value: The value to be associated with the key.
Expand All @@ -525,10 +519,10 @@ static struct bucket *move_empty_bucket(struct int_map *map __always_unused,
*
* Return: true if the map contains a mapping for the key, false if it does not.
*/
static bool update_mapping(struct int_map *map, struct bucket *neighborhood,
u64 key, void *new_value, bool update, void **old_value_ptr)
static bool update_mapping(struct bucket *neighborhood, u64 key, void *new_value,
bool update, void **old_value_ptr)
{
struct bucket *bucket = search_hop_list(map, neighborhood, key, NULL);
struct bucket *bucket = search_hop_list(neighborhood, key, NULL);

if (bucket == NULL) {
/* There is no bucket containing the key in the neighborhood. */
Expand Down Expand Up @@ -584,7 +578,7 @@ static struct bucket *find_or_make_vacancy(struct int_map *map,
* The nearest empty bucket isn't within the neighborhood that must contain the new
* entry, so try to swap it with bucket that is closer.
*/
hole = move_empty_bucket(map, hole);
hole = move_empty_bucket(hole);
}

return NULL;
Expand Down Expand Up @@ -625,7 +619,7 @@ int vdo_int_map_put(struct int_map *map, u64 key, void *new_value, bool update,
* Check whether the neighborhood already contains an entry for the key, in which case we
* optionally update it, returning the old value.
*/
if (update_mapping(map, neighborhood, key, new_value, update, old_value_ptr))
if (update_mapping(neighborhood, key, new_value, update, old_value_ptr))
return VDO_SUCCESS;

/*
Expand Down Expand Up @@ -679,7 +673,7 @@ void *vdo_int_map_remove(struct int_map *map, u64 key)
/* Select the bucket to search and search it for an existing entry. */
struct bucket *bucket = select_bucket(map, key);
struct bucket *previous;
struct bucket *victim = search_hop_list(map, bucket, key, &previous);
struct bucket *victim = search_hop_list(bucket, key, &previous);

if (victim == NULL) {
/* There is no matching entry to remove. */
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm-vdo/io-submitter.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ void __submit_metadata_vio(struct vio *vio, physical_block_number_t physical,
* completions.
* @max_requests_active: Number of bios for merge tracking.
* @vdo: The vdo which will use this submitter.
* @io_submitter: pointer to the new data structure.
* @io_submitter_ptr: pointer to the new data structure.
*
* Return: VDO_SUCCESS or an error.
*/
Expand Down
3 changes: 1 addition & 2 deletions drivers/md/dm-vdo/packer.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ static void abort_packing(struct data_vio *data_vio)
/**
* release_compressed_write_waiter() - Update a data_vio for which a successful compressed write
* has completed and send it on its way.
* @data_vio: The data_vio to release.
* @allocation: The allocation to which the compressed block was written.
*/
Expand Down Expand Up @@ -383,7 +382,7 @@ static void initialize_compressed_block(struct compressed_block *block, u16 size
* @compression: The agent's compression_state to pack in to.
* @data_vio: The data_vio to pack.
* @offset: The offset into the compressed block at which to pack the fragment.
* @compressed_block: The compressed block which will be written out when batch is fully packed.
* @block: The compressed block which will be written out when batch is fully packed.
*
* Return: The new amount of space used.
*/
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm-vdo/physical-zone.c
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ static int allocate_and_lock_block(struct allocation *allocation)
* @waiter: The allocating_vio that was waiting to allocate.
* @context: The context (unused).
*/
static void retry_allocation(struct vdo_waiter *waiter, void *context __always_unused)
static void retry_allocation(struct vdo_waiter *waiter, void __always_unused *context)
{
struct data_vio *data_vio = vdo_waiter_as_data_vio(waiter);

Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm-vdo/recovery-journal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,7 @@ static void add_queued_recovery_entries(struct recovery_journal_block *block)
*
* Implements waiter_callback_fn.
*/
static void write_block(struct vdo_waiter *waiter, void *context __always_unused)
static void write_block(struct vdo_waiter *waiter, void __always_unused *context)
{
struct recovery_journal_block *block =
container_of(waiter, struct recovery_journal_block, write_waiter);
Expand Down
9 changes: 3 additions & 6 deletions drivers/md/dm-vdo/slab-depot.c
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,7 @@ static struct reference_block * __must_check get_reference_block(struct vdo_slab
* slab_block_number_from_pbn() - Determine the index within the slab of a particular physical
* block number.
* @slab: The slab.
* @physical_block_number: The physical block number.
* @pbn: The physical block number.
* @slab_block_number_ptr: A pointer to the slab block number.
*
* Return: VDO_SUCCESS or an error code.
Expand Down Expand Up @@ -1459,7 +1459,6 @@ static int increment_for_data(struct vdo_slab *slab, struct reference_block *blo
* @block_number: The block to update.
* @old_status: The reference status of the data block before this decrement.
* @updater: The reference updater doing this operation in case we need to look up the pbn lock.
* @lock: The pbn_lock associated with the block being decremented (may be NULL).
* @counter_ptr: A pointer to the count for the data block (in, out).
* @adjust_block_count: Whether to update the allocator's free block count.
*
Expand Down Expand Up @@ -3232,8 +3231,7 @@ int vdo_enqueue_clean_slab_waiter(struct block_allocator *allocator,
/**
* vdo_modify_reference_count() - Modify the reference count of a block by first making a slab
* journal entry and then updating the reference counter.
*
* @data_vio: The data_vio for which to add the entry.
* @completion: The data_vio completion for which to add the entry.
* @updater: Which of the data_vio's reference updaters is being submitted.
*/
void vdo_modify_reference_count(struct vdo_completion *completion,
Expand Down Expand Up @@ -4750,8 +4748,7 @@ void vdo_use_new_slabs(struct slab_depot *depot, struct vdo_completion *parent)
/**
* stop_scrubbing() - Tell the scrubber to stop scrubbing after it finishes the slab it is
* currently working on.
* @scrubber: The scrubber to stop.
* @parent: The completion to notify when scrubbing has stopped.
* @allocator: The block allocator owning the scrubber to stop.
*/
static void stop_scrubbing(struct block_allocator *allocator)
{
Expand Down
4 changes: 2 additions & 2 deletions drivers/md/dm-vdo/vdo.c
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ static void finish_vdo(struct vdo *vdo)

/**
* free_listeners() - Free the list of read-only listeners associated with a thread.
* @thread_data: The thread holding the list to free.
* @thread: The thread holding the list to free.
*/
static void free_listeners(struct vdo_thread *thread)
{
Expand Down Expand Up @@ -852,7 +852,7 @@ int vdo_synchronous_flush(struct vdo *vdo)
/**
* vdo_get_state() - Get the current state of the vdo.
* @vdo: The vdo.
*
* Context: This method may be called from any thread.
*
* Return: The current state of the vdo.
Expand Down

0 comments on commit 63a477e

Please sign in to comment.