github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dm vdo: fold thread-cond-var.c into thread-utils

Browse Source 
Further cleanup is needed for thread-utils interfaces given many
functions should return void or be removed entirely because they
amount to obfuscation via wrappers.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
This commit is contained in:
Mike Snitzer 2024-02-09 09:54:53 -06:00
parent 8e6333af19
commit 877f36b764
4 changed files with 34 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/md/dm-vdo/Makefile
View File

@ -48,7 +48,6 @@ dm-vdo-objs := \
status-codes.o \
string-utils.o \
sysfs.o \
thread-cond-var.o \
thread-device.o \
thread-registry.o \
thread-utils.o \

46
drivers/md/dm-vdo/thread-cond-var.c
View File

@ -1,46 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright 2023 Red Hat
*/
#include <linux/jiffies.h>
#include <linux/minmax.h>
#include "errors.h"
#include "thread-utils.h"
#include "time-utils.h"
int uds_init_cond(struct cond_var *cv)
{
init_waitqueue_head(&cv->wait_queue);
return UDS_SUCCESS;
}
int uds_signal_cond(struct cond_var *cv)
{
wake_up(&cv->wait_queue);
return UDS_SUCCESS;
}
int uds_broadcast_cond(struct cond_var *cv)
{
wake_up_all(&cv->wait_queue);
return UDS_SUCCESS;
}
int uds_wait_cond(struct cond_var *cv, struct mutex *mutex)
{
DEFINE_WAIT(__wait);
prepare_to_wait(&cv->wait_queue, &__wait, TASK_IDLE);
uds_unlock_mutex(mutex);
schedule();
finish_wait(&cv->wait_queue, &__wait);
uds_lock_mutex(mutex);
return UDS_SUCCESS;
}
int uds_destroy_cond(struct cond_var *cv)
{
return UDS_SUCCESS;
}

11
drivers/md/dm-vdo/thread-utils.c
View File

@ -135,3 +135,14 @@ int uds_join_threads(struct thread *thread)
uds_free(thread);
return UDS_SUCCESS;
}
void uds_wait_cond(struct cond_var *cv, struct mutex *mutex)
{
DEFINE_WAIT(__wait);
prepare_to_wait(&cv->wait_queue, &__wait, TASK_IDLE);
uds_unlock_mutex(mutex);
schedule();
finish_wait(&cv->wait_queue, &__wait);
uds_lock_mutex(mutex);
}

28
drivers/md/dm-vdo/thread-utils.h
View File

@ -31,11 +31,29 @@ void uds_perform_once(atomic_t *once_state, void (*function) (void));
int uds_join_threads(struct thread *thread);
int __must_check uds_init_cond(struct cond_var *cond);
int uds_signal_cond(struct cond_var *cond);
int uds_broadcast_cond(struct cond_var *cond);
int uds_wait_cond(struct cond_var *cond, struct mutex *mutex);
int uds_destroy_cond(struct cond_var *cond);
static inline int __must_check uds_init_cond(struct cond_var *cv)
{
init_waitqueue_head(&cv->wait_queue);
return UDS_SUCCESS;
}
static inline void uds_signal_cond(struct cond_var *cv)
{
wake_up(&cv->wait_queue);
}
static inline void uds_broadcast_cond(struct cond_var *cv)
{
wake_up_all(&cv->wait_queue);
}
void uds_wait_cond(struct cond_var *cv, struct mutex *mutex);
/* FIXME: all below wrappers should be removed! */
static inline void uds_destroy_cond(struct cond_var *cv)
{
}
static inline int __must_check uds_init_mutex(struct mutex *mutex)
{