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
NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c
[safe/jmp/linux-2.6]
/
fs
/
eventpoll.c
diff --git
a/fs/eventpoll.c
b/fs/eventpoll.c
index
70aa66c
..
bd056a5
100644
(file)
--- a/
fs/eventpoll.c
+++ b/
fs/eventpoll.c
@@
-251,7
+251,7
@@
ctl_table epoll_table[] = {
.data = &max_user_watches,
.maxlen = sizeof(int),
.mode = 0644,
.data = &max_user_watches,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler =
&
proc_dointvec_minmax,
+ .proc_handler = proc_dointvec_minmax,
.extra1 = &zero,
},
{ }
.extra1 = &zero,
},
{ }
@@
-1206,7
+1206,7
@@
SYSCALL_DEFINE1(epoll_create1, int, flags)
* a file structure and a free file descriptor.
*/
error = anon_inode_getfd("[eventpoll]", &eventpoll_fops, ep,
* a file structure and a free file descriptor.
*/
error = anon_inode_getfd("[eventpoll]", &eventpoll_fops, ep,
-
flags & O_CLOEXEC
);
+
O_RDWR | (flags & O_CLOEXEC)
);
if (error < 0)
ep_free(ep);
if (error < 0)
ep_free(ep);