git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd: Use write gathering only with NFSv2
[safe/jmp/linux-2.6]
/
fs
/
eventfd.c
diff --git
a/fs/eventfd.c
b/fs/eventfd.c
index
2ce19c0
..
2a701d5
100644
(file)
--- a/
fs/eventfd.c
+++ b/
fs/eventfd.c
@@
-15,6
+15,7
@@
#include <linux/spinlock.h>
#include <linux/anon_inodes.h>
#include <linux/eventfd.h>
#include <linux/spinlock.h>
#include <linux/anon_inodes.h>
#include <linux/eventfd.h>
+#include <linux/syscalls.h>
struct eventfd_ctx {
wait_queue_head_t wqh;
struct eventfd_ctx {
wait_queue_head_t wqh;
@@
-27,6
+28,7
@@
struct eventfd_ctx {
* issue a wakeup.
*/
__u64 count;
* issue a wakeup.
*/
__u64 count;
+ unsigned int flags;
};
/*
};
/*
@@
-49,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))
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;
spin_unlock_irqrestore(&ctx->wqh.lock, flags);
return n;
@@
-86,22
+88,20
@@
static ssize_t eventfd_read(struct file *file, char __user *buf, size_t count,
{
struct eventfd_ctx *ctx = file->private_data;
ssize_t res;
{
struct eventfd_ctx *ctx = file->private_data;
ssize_t res;
- __u64 ucnt;
+ __u64 ucnt
= 0
;
DECLARE_WAITQUEUE(wait, current);
if (count < sizeof(ucnt))
return -EINVAL;
spin_lock_irq(&ctx->wqh.lock);
res = -EAGAIN;
DECLARE_WAITQUEUE(wait, current);
if (count < sizeof(ucnt))
return -EINVAL;
spin_lock_irq(&ctx->wqh.lock);
res = -EAGAIN;
- ucnt = ctx->count;
- if (ucnt > 0)
+ if (ctx->count > 0)
res = sizeof(ucnt);
else if (!(file->f_flags & O_NONBLOCK)) {
__add_wait_queue(&ctx->wqh, &wait);
for (res = 0;;) {
set_current_state(TASK_INTERRUPTIBLE);
if (ctx->count > 0) {
res = sizeof(ucnt);
else if (!(file->f_flags & O_NONBLOCK)) {
__add_wait_queue(&ctx->wqh, &wait);
for (res = 0;;) {
set_current_state(TASK_INTERRUPTIBLE);
if (ctx->count > 0) {
- ucnt = ctx->count;
res = sizeof(ucnt);
break;
}
res = sizeof(ucnt);
break;
}
@@
-116,10
+116,11
@@
static ssize_t eventfd_read(struct file *file, char __user *buf, size_t count,
__remove_wait_queue(&ctx->wqh, &wait);
__set_current_state(TASK_RUNNING);
}
__remove_wait_queue(&ctx->wqh, &wait);
__set_current_state(TASK_RUNNING);
}
- if (res > 0) {
- ctx->count = 0;
+ if (likely(res > 0)) {
+ ucnt = (ctx->flags & EFD_SEMAPHORE) ? 1 : ctx->count;
+ ctx->count -= ucnt;
if (waitqueue_active(&ctx->wqh))
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))
}
spin_unlock_irq(&ctx->wqh.lock);
if (res > 0 && put_user(ucnt, (__u64 __user *) buf))
@@
-165,10
+166,10
@@
static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t c
__remove_wait_queue(&ctx->wqh, &wait);
__set_current_state(TASK_RUNNING);
}
__remove_wait_queue(&ctx->wqh, &wait);
__set_current_state(TASK_RUNNING);
}
- if (
res > 0
) {
+ if (
likely(res > 0)
) {
ctx->count += ucnt;
if (waitqueue_active(&ctx->wqh))
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);
}
spin_unlock_irq(&ctx->wqh.lock);
@@
-197,12
+198,17
@@
struct file *eventfd_fget(int fd)
return file;
}
return file;
}
-
asmlinkage long sys_eventfd(unsigned int count
)
+
SYSCALL_DEFINE2(eventfd2, unsigned int, count, int, flags
)
{
{
- int
error,
fd;
+ int fd;
struct eventfd_ctx *ctx;
struct eventfd_ctx *ctx;
- struct file *file;
- struct inode *inode;
+
+ /* Check the EFD_* constants for consistency. */
+ BUILD_BUG_ON(EFD_CLOEXEC != O_CLOEXEC);
+ BUILD_BUG_ON(EFD_NONBLOCK != O_NONBLOCK);
+
+ if (flags & ~EFD_FLAGS_SET)
+ return -EINVAL;
ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
@@
-210,17
+216,21
@@
asmlinkage long sys_eventfd(unsigned int count)
init_waitqueue_head(&ctx->wqh);
ctx->count = count;
init_waitqueue_head(&ctx->wqh);
ctx->count = count;
+ ctx->flags = flags;
/*
* When we call this, the initialization must be complete, since
* anon_inode_getfd() will install the fd.
*/
/*
* When we call this, the initialization must be complete, since
* anon_inode_getfd() will install the fd.
*/
- error = anon_inode_getfd(&fd, &inode, &file, "[eventfd]",
- &eventfd_fops, ctx);
- if (!error)
- return fd;
+ fd = anon_inode_getfd("[eventfd]", &eventfd_fops, ctx,
+ flags & EFD_SHARED_FCNTL_FLAGS);
+ if (fd < 0)
+ kfree(ctx);
+ return fd;
+}
- kfree(ctx);
- return error;
+SYSCALL_DEFINE1(eventfd, unsigned int, count)
+{
+ return sys_eventfd2(count, 0);
}
}