projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
mm
/
secretmem.c
diff --git
a/mm/secretmem.c
b/mm/secretmem.c
index
030f02d
..
1fea68b
100644
(file)
--- a/
mm/secretmem.c
+++ b/
mm/secretmem.c
@@
-18,6
+18,7
@@
#include <linux/secretmem.h>
#include <linux/set_memory.h>
#include <linux/sched/signal.h>
#include <linux/secretmem.h>
#include <linux/set_memory.h>
#include <linux/sched/signal.h>
+#include <linux/refcount.h>
#include <uapi/linux/magic.h>
#include <uapi/linux/magic.h>
@@
-40,11
+41,11
@@
module_param_named(enable, secretmem_enable, bool, 0400);
MODULE_PARM_DESC(secretmem_enable,
"Enable secretmem and memfd_secret(2) system call");
MODULE_PARM_DESC(secretmem_enable,
"Enable secretmem and memfd_secret(2) system call");
-static
atomic
_t secretmem_users;
+static
refcount
_t secretmem_users;
bool secretmem_active(void)
{
bool secretmem_active(void)
{
- return !!
atomic
_read(&secretmem_users);
+ return !!
refcount
_read(&secretmem_users);
}
static vm_fault_t secretmem_fault(struct vm_fault *vmf)
}
static vm_fault_t secretmem_fault(struct vm_fault *vmf)
@@
-103,7
+104,7
@@
static const struct vm_operations_struct secretmem_vm_ops = {
static int secretmem_release(struct inode *inode, struct file *file)
{
static int secretmem_release(struct inode *inode, struct file *file)
{
-
atomic
_dec(&secretmem_users);
+
refcount
_dec(&secretmem_users);
return 0;
}
return 0;
}
@@
-217,7
+218,7
@@
SYSCALL_DEFINE1(memfd_secret, unsigned int, flags)
file->f_flags |= O_LARGEFILE;
fd_install(fd, file);
file->f_flags |= O_LARGEFILE;
fd_install(fd, file);
-
atomic
_inc(&secretmem_users);
+
refcount
_inc(&secretmem_users);
return fd;
err_put_fd:
return fd;
err_put_fd: