upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

linuxkpi: rwlock: Simplify code

Browse source 
Just use a typedef for rwlock_t, no need to create a useless
structure.

Reviewed by:		bz
Sponsored by:		Beckhoff Automation GmbH & Co. KG
Differential Revision:	https://reviews.freebsd.org/D45206

(cherry picked from commit 5c0a1923486e65cd47398e52c03cb289d6120a78)

linuxkpi: rwlock: Fix rwlock_init

Some linux code re-init some spinlock so add MTX_NEW to mtx_init.

Reported by:    rlibby
Fixes:          5c0a1923486e ("linuxkpi: rwlock: Simplify code")

(cherry picked from commit a7b222db122e99f587d87eeec303c8abc9aea04e)
This commit is contained in:
Emmanuel Vadot 2024-05-15 11:05:29 +02:00
parent 183b64dfd8
commit f4f09d270c
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sys/compat/linuxkpi/common/include/linux/rwlock.h
View file

@ -34,14 +34,12 @@
#include <sys/rwlock.h>
#include <sys/libkern.h>
typedef struct {
struct rwlock rw;
} rwlock_t;
typedef struct rwlock rwlock_t;
#define read_lock(_l) rw_rlock(&(_l)->rw)
#define write_lock(_l) rw_wlock(&(_l)->rw)
#define read_unlock(_l) rw_runlock(&(_l)->rw)
#define write_unlock(_l) rw_wunlock(&(_l)->rw)
#define read_lock(_l) rw_rlock(_l)
#define write_lock(_l) rw_wlock(_l)
#define read_unlock(_l) rw_runlock(_l)
#define write_unlock(_l) rw_wunlock(_l)
#define read_lock_irq(lock) read_lock((lock))
#define read_unlock_irq(lock) read_unlock((lock))
#define write_lock_irq(lock) write_lock((lock))
@ -54,13 +52,6 @@ typedef struct {
do { read_unlock(lock); } while (0)
#define write_unlock_irqrestore(lock, flags) \
do { write_unlock(lock); } while (0)
static inline void
rwlock_init(rwlock_t *lock)
{
memset(&lock->rw, 0, sizeof(lock->rw));
rw_init_flags(&lock->rw, "lnxrw", RW_NOWITNESS);
}
#define rwlock_init(_l) rw_init_flags(_l, "lnxrw", RW_NOWITNESS | RW_NEW)
#endif /* _LINUXKPI_LINUX_RWLOCK_H_ */