github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env: refactor rwmutex

Browse Source 
All the operations on `count` are performed under the lock thus it doesn't need
to be atomic.

Signed-off-by: Michal Mielewczyk <michal.mielewczyk@intel.com>
This commit is contained in:
Michal Mielewczyk 2021-08-17 15:43:30 +02:00
parent 39bab9ad87
commit 5e4fcb62be
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/cas_cache/ocf_env.h
View File

@ -135,14 +135,14 @@ static inline void env_mutex_destroy(env_mutex *mutex)
typedef struct { typedef struct {
struct mutex mutex; struct mutex mutex;
atomic_t count; uint32_t count;
struct task_struct *holder; struct task_struct *holder;
} env_rmutex; } env_rmutex;
static inline int env_rmutex_init(env_rmutex *rmutex) static inline int env_rmutex_init(env_rmutex *rmutex)
{ {
mutex_init(&rmutex->mutex); mutex_init(&rmutex->mutex);
atomic_set(&rmutex->count, 0); rmutex->count = 0;
rmutex->holder = NULL; rmutex->holder = NULL;
return 0; return 0;
} }
@ -150,20 +150,20 @@ static inline int env_rmutex_init(env_rmutex *rmutex)
static inline void env_rmutex_lock(env_rmutex *rmutex) static inline void env_rmutex_lock(env_rmutex *rmutex)
{ {
if (current == rmutex->holder) { if (current == rmutex->holder) {
atomic_inc(&rmutex->count); rmutex->count++;
return; return;
} }
mutex_lock(&rmutex->mutex); mutex_lock(&rmutex->mutex);
rmutex->holder = current; rmutex->holder = current;
atomic_inc(&rmutex->count); rmutex->count++;
} }
static inline int env_rmutex_lock_interruptible(env_rmutex *rmutex) static inline int env_rmutex_lock_interruptible(env_rmutex *rmutex)
{ {
int result = 0; int result = 0;
if (current == rmutex->holder) { if (current == rmutex->holder) {
atomic_inc(&rmutex->count); rmutex->count++;
return 0; return 0;
} }
@ -174,7 +174,7 @@ static inline int env_rmutex_lock_interruptible(env_rmutex *rmutex)
} }
rmutex->holder = current; rmutex->holder = current;
atomic_inc(&rmutex->count); rmutex->count++;
return 0; return 0;
} }
@ -182,7 +182,7 @@ static inline int env_rmutex_lock_interruptible(env_rmutex *rmutex)
static inline int env_rmutex_trylock(env_rmutex *rmutex) static inline int env_rmutex_trylock(env_rmutex *rmutex)
{ {
if (current == rmutex->holder) { if (current == rmutex->holder) {
atomic_inc(&rmutex->count); rmutex->count++;
return 0; return 0;
} }
@ -192,7 +192,7 @@ static inline int env_rmutex_trylock(env_rmutex *rmutex)
} }
rmutex->holder = current; rmutex->holder = current;
atomic_inc(&rmutex->count); rmutex->count++;
return 0; return 0;
} }
@ -201,7 +201,7 @@ static inline void env_rmutex_unlock(env_rmutex *rmutex)
{ {
BUG_ON(current != rmutex->holder); BUG_ON(current != rmutex->holder);
if (atomic_dec_return(&rmutex->count)) { if (--rmutex->count) {
return; return;
} }