tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-4
+3
-4
fs/pstore/pmsg.c
+3
-4
fs/pstore/pmsg.c
···
7
7
#include <linux/device.h>
8
8
#include <linux/fs.h>
9
9
#include <linux/uaccess.h>
10
-
#include <linux/rtmutex.h>
11
10
#include "internal.h"
12
11
13
-
static DEFINE_RT_MUTEX(pmsg_lock);
12
+
static DEFINE_MUTEX(pmsg_lock);
14
13
15
14
static ssize_t write_pmsg(struct file *file, const char __user *buf,
16
15
size_t count, loff_t *ppos)
···
28
29
if (!access_ok(buf, count))
29
30
return -EFAULT;
30
31
31
-
rt_mutex_lock(&pmsg_lock);
32
+
mutex_lock(&pmsg_lock);
32
33
ret = psinfo->write_user(&record, buf);
33
-
rt_mutex_unlock(&pmsg_lock);
34
+
mutex_unlock(&pmsg_lock);
34
35
return ret ? ret : count;
35
36
}
36
37