Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39510888 authored by Davide Libenzi's avatar Davide Libenzi Committed by Linus Torvalds
Browse files

epoll keyed wakeups: make eventfd use keyed wakeups 



Introduce keyed event wakeups inside the eventfd code.

Signed-off-by: default avatarDavide Libenzi <davidel@xmailserver.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>
Cc: William Lee Irwin III <wli@movementarian.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2dfa4eea

fs/eventfd.c

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ int eventfd_signal(struct file *file, int n) 
		n = (int) (ULLONG_MAX - ctx->count);

	ctx->count += n;

	if (waitqueue_active(&ctx->wqh))

		wake_up_locked(&ctx->wqh);

		wake_up_locked_poll(&ctx->wqh, POLLIN);

	spin_unlock_irqrestore(&ctx->wqh.lock, flags);



	return n;
@@ -120,7 +120,7 @@ static ssize_t eventfd_read(struct file *file, char __user *buf, size_t count, 
		ucnt = (ctx->flags & EFD_SEMAPHORE) ? 1 : ctx->count;

		ctx->count -= ucnt;

		if (waitqueue_active(&ctx->wqh))

			wake_up_locked(&ctx->wqh);

			wake_up_locked_poll(&ctx->wqh, POLLOUT);

	}

	spin_unlock_irq(&ctx->wqh.lock);

	if (res > 0 && put_user(ucnt, (__u64 __user *) buf))
@@ -169,7 +169,7 @@ static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t c 
	if (likely(res > 0)) {

		ctx->count += ucnt;

		if (waitqueue_active(&ctx->wqh))

			wake_up_locked(&ctx->wqh);

			wake_up_locked_poll(&ctx->wqh, POLLIN);

	}

	spin_unlock_irq(&ctx->wqh.lock);