diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-08-30 12:29:49 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-07 19:54:57 -0400 |
commit | 4e10f3c98888ee88ea2543aa636db6410fa47477 (patch) | |
tree | b54140b4a3db046bebc404ae57e61d9f1ca31b94 /include/linux/eventfd.h | |
parent | d040790391f292bbe5bc6b990c66af9787c855a1 (diff) |
Kill indirect include of file.h from eventfd.h, use fdget() in cgroup.c
kernel/cgroup.c is the only place in the tree that relies on eventfd.h
pulling file.h; move that include there. Switch from eventfd_fget()/fput()
to fdget()/fdput(), while we are at it - eventfd_ctx_fileget() will fail
on non-eventfd descriptors just fine, no need to do that check twice...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/eventfd.h')
-rw-r--r-- | include/linux/eventfd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h index cf5d2af61b81..ff0b981f078e 100644 --- a/include/linux/eventfd.h +++ b/include/linux/eventfd.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #define _LINUX_EVENTFD_H | 9 | #define _LINUX_EVENTFD_H |
10 | 10 | ||
11 | #include <linux/fcntl.h> | 11 | #include <linux/fcntl.h> |
12 | #include <linux/file.h> | ||
13 | #include <linux/wait.h> | 12 | #include <linux/wait.h> |
14 | 13 | ||
15 | /* | 14 | /* |
@@ -26,6 +25,8 @@ | |||
26 | #define EFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK) | 25 | #define EFD_SHARED_FCNTL_FLAGS (O_CLOEXEC | O_NONBLOCK) |
27 | #define EFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS | EFD_SEMAPHORE) | 26 | #define EFD_FLAGS_SET (EFD_SHARED_FCNTL_FLAGS | EFD_SEMAPHORE) |
28 | 27 | ||
28 | struct file; | ||
29 | |||
29 | #ifdef CONFIG_EVENTFD | 30 | #ifdef CONFIG_EVENTFD |
30 | 31 | ||
31 | struct file *eventfd_file_create(unsigned int count, int flags); | 32 | struct file *eventfd_file_create(unsigned int count, int flags); |