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 'locking-urgent-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
fs
/
userfaultfd.c
diff --git
a/fs/userfaultfd.c
b/fs/userfaultfd.c
index
6e264dd
..
0e4a383
100644
(file)
--- a/
fs/userfaultfd.c
+++ b/
fs/userfaultfd.c
@@
-61,7
+61,7
@@
struct userfaultfd_ctx {
/* waitqueue head for events */
wait_queue_head_t event_wqh;
/* a refile sequence protected by fault_pending_wqh lock */
/* waitqueue head for events */
wait_queue_head_t event_wqh;
/* a refile sequence protected by fault_pending_wqh lock */
- s
truct seqcoun
t refile_seq;
+ s
eqcount_spinlock_
t refile_seq;
/* pseudo fd refcounting */
refcount_t refcount;
/* userfaultfd syscall flags */
/* pseudo fd refcounting */
refcount_t refcount;
/* userfaultfd syscall flags */
@@
-1961,7
+1961,7
@@
static void init_once_userfaultfd_ctx(void *mem)
init_waitqueue_head(&ctx->fault_wqh);
init_waitqueue_head(&ctx->event_wqh);
init_waitqueue_head(&ctx->fd_wqh);
init_waitqueue_head(&ctx->fault_wqh);
init_waitqueue_head(&ctx->event_wqh);
init_waitqueue_head(&ctx->fd_wqh);
- seqcount_
init(&ctx->refile_seq
);
+ seqcount_
spinlock_init(&ctx->refile_seq, &ctx->fault_pending_wqh.lock
);
}
SYSCALL_DEFINE1(userfaultfd, int, flags)
}
SYSCALL_DEFINE1(userfaultfd, int, flags)