diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-28 03:03:40 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-28 03:03:40 +0300 |
| commit | 0835b5ee8704aef4e19b369237a762c52c7b6fb1 (patch) | |
| tree | 005f32adf443a525942d845fab36d9e4c7913cf2 /fs/pstore | |
| parent | 900941bea3f69859c8e4cb17e4fd89c3ff6ade99 (diff) | |
| parent | 5239a89b06d6b199f133bf0ffea421683187f257 (diff) | |
| download | linux-0835b5ee8704aef4e19b369237a762c52c7b6fb1.tar.xz | |
Merge tag 'pstore-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore update from Kees Cook:
- Revert pmsg_lock back to a normal mutex (John Stultz)
* tag 'pstore-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
pstore: Revert pmsg_lock back to a normal mutex
Diffstat (limited to 'fs/pstore')
| -rw-r--r-- | fs/pstore/pmsg.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/pstore/pmsg.c b/fs/pstore/pmsg.c index aa178304bc03..55f139afa327 100644 --- a/fs/pstore/pmsg.c +++ b/fs/pstore/pmsg.c @@ -7,10 +7,9 @@ #include <linux/device.h> #include <linux/fs.h> #include <linux/uaccess.h> -#include <linux/rtmutex.h> #include "internal.h" -static DEFINE_RT_MUTEX(pmsg_lock); +static DEFINE_MUTEX(pmsg_lock); static ssize_t write_pmsg(struct file *file, const char __user *buf, size_t count, loff_t *ppos) @@ -29,9 +28,9 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf, if (!access_ok(buf, count)) return -EFAULT; - rt_mutex_lock(&pmsg_lock); + mutex_lock(&pmsg_lock); ret = psinfo->write_user(&record, buf); - rt_mutex_unlock(&pmsg_lock); + mutex_unlock(&pmsg_lock); return ret ? ret : count; } |